summaryrefslogtreecommitdiffstats
path: root/wp-includes/pluggable.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-05-07 17:24:37 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-05-07 17:24:37 +0000
commitf44f8d99d185805bf7bb1e03d5fba040cc907c4d (patch)
tree4c60f57ae136aa89ab7efc9681f6baeaea2a5372 /wp-includes/pluggable.php
parent7d0c48b73d78a1405bdaf1d6196fa4c0593d59a2 (diff)
downloadwordpress-mu-f44f8d99d185805bf7bb1e03d5fba040cc907c4d.tar.gz
wordpress-mu-f44f8d99d185805bf7bb1e03d5fba040cc907c4d.tar.xz
wordpress-mu-f44f8d99d185805bf7bb1e03d5fba040cc907c4d.zip
Ignore activation key in db.
Generate a correct key, thanks mtdewvirus git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1273 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/pluggable.php')
-rw-r--r--wp-includes/pluggable.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php
index eabf1ae..be7dda2 100644
--- a/wp-includes/pluggable.php
+++ b/wp-includes/pluggable.php
@@ -1175,8 +1175,11 @@ if ( !function_exists('wp_generate_password') ) :
*
* @return string The random password
**/
-function wp_generate_password($length = 12) {
- $chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()";
+function wp_generate_password($length = 12, $special_chars = true) {
+ $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+ if ( $special_chars )
+ $chars .= '!@#$%^&*()';
+
$password = '';
for ( $i = 0; $i < $length; $i++ )
$password .= substr($chars, mt_rand(0, strlen($chars) - 1), 1);