golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add length arg to wp_generate_password() and lengthen secret. Props tellyworth. fixes #6146 for trunk 

git-svn-id: http://svn.automattic.com/wordpress/trunk@7796 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-04-24 00:19:09 +00:00
parent 1e811e8742
commit 4680f8f084
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/schema.php
View File

@ -230,7 +230,7 @@ function populate_options() {
}
// 2.0.3
add_option('secret', wp_generate_password());
add_option('secret', wp_generate_password(64));
// 2.1
add_option('blog_public', '1');

10
wp-admin/includes/upgrade.php
View File

@ -202,6 +202,9 @@ function upgrade_all() {
if ( $wp_current_db_version < 7499 )
upgrade_250();
if ( $wp_current_db_version < 7796 )
upgrade_251();
maybe_disable_automattic_widgets();
$wp_rewrite->flush_rules();
@ -723,6 +726,13 @@ function upgrade_250() {
}
function upgrade_251() {
global $wp_current_db_version;
// Make the secret longer
update_option('secret', wp_generate_password(64));
}
// The functions we use to actually do stuff
// General

7
wp-includes/pluggable.php
View File

@ -1167,12 +1167,11 @@ if ( !function_exists('wp_generate_password') ) :
*
* @return string The random password
**/
function wp_generate_password() {
$chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
$length = 7;
function wp_generate_password($length = 12) {
$chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()";
$password = '';
for ( $i = 0; $i < $length; $i++ )
$password .= substr($chars, mt_rand(0, 61), 1);
$password .= substr($chars, mt_rand(0, strlen($chars)), 1);
return $password;
}
endif;

2
wp-includes/version.php
View File

@ -16,6 +16,6 @@ $wp_version = '2.6-bleeding';
*
* @global int $wp_db_version
*/
$wp_db_version = 7574;
$wp_db_version = 7796;
?>