Ticket #12184: changes.diff

wp-includes/pluggable.php

@@ -1129 +1129 @@
 }
 endif;
 
-if ( !function_exists('wp_password_change_notification') ) :
-/**
- * Notify the blog admin of a user changing password, normally via email.
- *
- * @since 2.7
- *
- * @param object $user User Object
- */
-function wp_password_change_notification(&$user) {
-        // send a copy of password change notification to the admin
-        // but check to see if it's the admin whose password we're changing, and skip this
-        if ( $user->user_email != get_option('admin_email') ) {
-                $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
-                // The blogname option is escaped with esc_html on the way into the database in sanitize_option
-                // we want to reverse this for the plain text arena of emails.
-                $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
-                wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), $blogname), $message);
-        }
-}
-endif;
-
-if ( !function_exists('wp_new_user_notification') ) :
-/**
- * Notify the blog admin of a new user, normally via email.
- *
- * @since 2.0
- *
- * @param int $user_id User ID
- * @param string $plaintext_pass Optional. The user's plaintext password
- */
-function wp_new_user_notification($user_id, $plaintext_pass = '') {
-        $user = new WP_User($user_id);
-
-        $user_login = stripslashes($user->user_login);
-        $user_email = stripslashes($user->user_email);
-
-        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
-        // we want to reverse this for the plain text arena of emails.
-        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
-
-        $message  = sprintf(__('New user registration on your blog %s:'), $blogname) . "\r\n\r\n";
-        $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
-        $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n";
-
-        @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
-
-        if ( empty($plaintext_pass) )
-                return;
-
-        $message  = sprintf(__('Username: %s'), $user_login) . "\r\n";
-        $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
-        $message .= wp_login_url() . "\r\n";
-
-        wp_mail($user_email, sprintf(__('[%s] Your username and password'), $blogname), $message);
-
-}
-endif;
-
 if ( !function_exists('wp_nonce_tick') ) :
 /**
  * Get the time-dependent variable for nonce creation.

wp-login.php

@@ -317 +317 @@
         return $user_id;
 }
 
+if ( !function_exists('wp_password_change_notification') ) :
+/**
+ * Notify the blog admin of a user changing password, normally via email.
+ *
+ * NOTE: The method of overriding this function has been deprecated. The provided hooks should be used instead.
+ *
+ * @since 2.7
+ *
+ * @param object $user User Object
+ */
+function wp_password_change_notification(&$user) {
+        // Allow plugins to short-circuit notification
+        $disable = apply_filters('disable_password_change_notification', false, $user);
+        if ( $disable )
+                return;
+
+        do_action('password_change_notification', $user);
+        // send a copy of password change notification to the admin
+        // but check to see if it's the admin whose password we're changing, and skip this
+        if ( $user->user_email != get_option('admin_email') ) {
+                $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
+                // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+                // we want to reverse this for the plain text arena of emails.
+                $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+                
+                $title = sprintf(__('[%s] Password Lost/Changed'), $blogname);
+                
+                $title = apply_filters('password_change_admin_notification_title', $title);
+                $message = apply_fitlers('password_change_admin_notification_message', $message, $user);
+                
+                @wp_mail(get_option('admin_email'), $title, $message);
+        }
+}
+endif;
+
+if ( !function_exists('wp_new_user_notification') ) :
+/**
+ * Notify the blog admin of a new user, normally via email.
+ *
+ * NOTE: The method of overriding this function has been deprecated. The provided hooks should be used instead.
+ *
+ * @since 2.0
+ *
+ * @param int $user_id User ID
+ * @param string $plaintext_pass Optional. The user's plaintext password
+ */
+function wp_new_user_notification($user_id, $plaintext_pass = '') {
+        $user = new WP_User($user_id);
+        
+        // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+        // we want to reverse this for the plain text arena of emails.
+        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+        
+        // Allow plugins to short-circuit admin notification
+        $disable = apply_filters('disable_new_user_admin_notification', false, $user);
+        if ( ! $disable ) {             
+                do_action('new_user_admin_notification', $user);
+
+                $user_login = stripslashes($user->user_login);
+                $user_email = stripslashes($user->user_email);
+
+                $message  = sprintf(__('New user registration on your blog %s:'), $blogname) . "\r\n\r\n";
+                $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
+                $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n";
+        
+                $title = sprintf(__('[%s] New User Registration'), $blogname);
+        
+                $title = apply_filters('new_user_admin_notification_title', $title);
+                $message = apply_filters('new_user_admin_notification_message', $message, $user);
+
+                @wp_mail(get_option('admin_email'), $title, $message);
+        }
+        
+        if ( empty($plaintext_pass) )
+                return;
+        
+        // Allow plugins to short-circuit user notification
+        $disable = apply_filters('disable_new_user_notification', false, $user);
+        if ( ! $disable ) {
+                do_action('new_user_notification', $user, $plaintext_pass);
+
+                $message  = sprintf(__('Username: %s'), $user_login) . "\r\n";
+                $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
+                $message .= wp_login_url() . "\r\n";
+        
+                $title = sprintf(__('[%s] Your username and password'), $blogname);
+        
+                $title = apply_filters('new_user_notification', $title);
+                $message = apply_filters('new_user_notification', $message, $user, $plaintext_pass);
+
+                wp_mail($user_email, $title, $message);
+        }
+}
+endif;
+
 //
 // Main
 //