Changeset 29205

Timestamp:

07/17/2014 09:11:46 AM (10 years ago)

Author:

DrewAPicture

Message:

Fix syntax for single- and multi-line comments in root-directory files.

See #28931.

Location:

trunk/src

Files:

• wp-login.php (modified) (4 diffs)
• wp-mail.php (modified) (3 diffs)
• wp-signup.php (modified) (1 diff)

trunk/src/wp-login.php

@@ -70 +70 @@
     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() ) {
         ?>
@@ -297 +299 @@
     }
 
-    // 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;
@@ -310 +312 @@
      */
     do_action( 'retreive_password', $user_login );
+
     /**
      * Fires before a new password is retrieved.
@@ -365 +368 @@
         $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);
 

trunk/src/wp-mail.php

@@ -69 +69 @@
     $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;
@@ -109 +109 @@
             }
 
-            // 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) )
@@ -172 +174 @@
         $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);

trunk/src/wp-signup.php

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