Ticket #28931: wp-root-28931.diff

src/wp-login.php

@@ -69 +69 @@
 
         wp_admin_css( 'login', true );
 
-        // Remove all stored post data on logging out.
-        // This could be added by add_action('login_head'...) like wp_shake_js()
-        // but maybe better if it's not removable by plugins
+        /*
+         * Remove all stored post data on logging out.
+         * This could be added by add_action('login_head'...) like wp_shake_js(),
+         * but maybe better if it's not removable by plugins
+         */
         if ( 'loggedout' == $wp_error->get_error_code() ) {
                 ?>
                 <script>if("sessionStorage" in window){try{for(var key in sessionStorage){if(key.indexOf("wp-autosave-")!=-1){sessionStorage.removeItem(key)}}}catch(e){}};</script>
@@ -296 +298 @@
                 return $errors;
         }
 
-        // redefining user_login ensures we return the right case in the email
+        // Redefining user_login ensures we return the right case in the email.
         $user_login = $user_data->user_login;
         $user_email = $user_data->user_email;
 
@@ -309 +311 @@
          * @param string $user_login The user login name.
          */
         do_action( 'retreive_password', $user_login );
+
         /**
          * Fires before a new password is retrieved.
          *
@@ -364 +367 @@
         if ( is_multisite() )
                 $blogname = $GLOBALS['current_site']->site_name;
         else
-                // 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.
+                /*
+                 * 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 Reset'), $blogname );

src/wp-mail.php

@@ -68 +68 @@
         $author_found = false;
         $dmonths = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
         foreach ($message as $line) {
-                // body signal
+                // Body signal.
                 if ( strlen($line) < 3 )
                         $bodysignal = true;
                 if ( $bodysignal ) {
@@ -108 +108 @@
                                 $subject = $subject[0];
                         }
 
-                        // Set the author using the email address (From or Reply-To, the last used)
-                        // otherwise use the site admin
+                        /*
+                         * Set the author using the email address (From or Reply-To, the last used)
+                         * otherwise use the site admin.
+                         */
                         if ( ! $author_found && preg_match( '/^(From|Reply-To): /', $line ) ) {
                                 if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) )
                                         $author = $matches[0];
@@ -171 +173 @@
         if ( $content_type == 'multipart/alternative' ) {
                 $content = explode('--'.$boundary, $content);
                 $content = $content[2];
-                // match case-insensitive content-transfer-encoding
+
+                // Match case-insensitive content-transfer-encoding.
                 if ( preg_match( '/Content-Transfer-Encoding: quoted-printable/i', $content, $delim) ) {
                         $content = explode($delim[0], $content);
                         $content = $content[1];

src/wp-signup.php

@@ -316 +316 @@
 
         $result = validate_blog_form();
 
-        // extracted values set/overwrite globals
+        // Extracted values set/overwrite globals.
         $domain = $result['domain'];
         $path = $result['path'];
         $blogname = $result['blogname'];