summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-07-23 11:50:08 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-07-23 11:50:08 +0000
commit37294a4226c73ccb36514c419852df74e208d2de (patch)
tree389b60f6ab21a9d9f2f83570554c290d0161a44d
parentefe3cf442bc611637d525aa635f0ba1e48a0d541 (diff)
downloadwordpress-mu-37294a4226c73ccb36514c419852df74e208d2de.tar.gz
wordpress-mu-37294a4226c73ccb36514c419852df74e208d2de.tar.xz
wordpress-mu-37294a4226c73ccb36514c419852df74e208d2de.zip
Allow password reset, fixes #690, props axelseaa
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1396 7be80a69-a1ef-0310-a953-fb0f7c49ff36
-rw-r--r--wp-login.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/wp-login.php b/wp-login.php
index d602170..e560bca 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -129,6 +129,13 @@ function retrieve_password() {
do_action('retreive_password', $user_login); // Misspelled and deprecated
do_action('retrieve_password', $user_login);
+ $allow = apply_filters('allow_password_reset', true, $user_data->id);
+
+ if ( ! $allow )
+ return new WP_Error('no_password_reset', __('Password reset is not allowed for this user'));
+ else if ( is_wp_error($allow) )
+ return $allow;
+
$key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE user_login = %s", $user_login));
if ( empty($key) ) {
// Generate something random for a key...