Ticket #42297: 42297.diff

src/wp-admin/nav-menus.php

@@ -611 +611 @@
                 if ( 1 == $num_locations ) {
                         echo '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '</p>';
                 } else {
-                        echo '<p>' .  sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
+                        echo '<p>' . sprintf( _n( 'Your theme supports %s menu. Select which menu appears in each location.', 'Your theme supports %s menus. Select which menu appears in each location.', $num_locations ), number_format_i18n( $num_locations ) ) . '</p>';
                 }
         ?>
         <div id="menu-locations-wrap">

src/wp-includes/class-pop3.php

@@ -318 +318 @@
         if(!$this->is_ok($reply))
         {
             $reply = $this->strip_clf($reply);
-            $this->ERROR = "POP3 pop_list: " . _("Error ") .  "[$reply]";
+            $this->ERROR = "POP3 pop_list: " . _("Error ") . "[$reply]";
             return false;
         }
         $MsgArray = array();

src/wp-includes/class-wp-text-diff-renderer-table.php

@@ -210 +210 @@
                                 $line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'unchanged' );
                         }
                         if (  $this->_show_split_view ) {
-                                $r .= '<tr>' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line )  . "</tr>\n";
+                                $r .= '<tr>' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line ) . "</tr>\n";
                         } else {
                                 $r .= '<tr>' . $this->contextLine( $line ) . "</tr>\n";
                         }

src/wp-includes/comment-template.php

@@ -2199 +2199 @@
                 'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
                             '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $aria_req . $html_req . ' /></p>',
                 'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-                            '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $aria_req . $html_req  . ' /></p>',
+                            '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $aria_req . $html_req . ' /></p>',
                 'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
                             '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
         );

src/wp-includes/http.php

@@ -488 +488 @@
         $origin = get_http_origin();
 
         if ( is_allowed_http_origin( $origin ) ) {
-                @header( 'Access-Control-Allow-Origin: ' .  $origin );
+                @header( 'Access-Control-Allow-Origin: ' . $origin );
                 @header( 'Access-Control-Allow-Credentials: true' );
                 if ( 'OPTIONS' === $_SERVER['REQUEST_METHOD'] )
                         exit;

src/wp-includes/post.php

@@ -4662 +4662 @@
                 $hierarchical = false;
                 $incpages = wp_parse_id_list( $r['include'] );
                 if ( ! empty( $incpages ) ) {
-                        $inclusions = ' AND ID IN (' . implode( ',', $incpages ) .  ')';
+                        $inclusions = ' AND ID IN (' . implode( ',', $incpages ) . ')';
                 }
         }
 
@@ -4670 +4670 @@
         if ( ! empty( $exclude ) ) {
                 $expages = wp_parse_id_list( $exclude );
                 if ( ! empty( $expages ) ) {
-                        $exclusions = ' AND ID NOT IN (' . implode( ',', $expages ) .  ')';
+                        $exclusions = ' AND ID NOT IN (' . implode( ',', $expages ) . ')';
                 }
         }
 

src/wp-includes/wp-db.php

@@ -1051 +1051 @@
                                 $message .= '<li>' . sprintf(
                                         /* translators: 1: database user, 2: database name */
                                         __( 'Does the user %1$s have permission to use the %2$s database?' ),
-                                        '<code>' . htmlspecialchars( $this->dbuser, ENT_QUOTES )  . '</code>',
+                                        '<code>' . htmlspecialchars( $this->dbuser, ENT_QUOTES ) . '</code>',
                                         '<code>' . htmlspecialchars( $db, ENT_QUOTES ) . '</code>'
                                 ) . "</li>\n";
 

src/wp-login.php

@@ -424 +424 @@
         if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
                 $_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
 
-        $url = dirname( set_url_scheme( 'http://' .  $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] ) );
+        $url = dirname( set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] ) );
         if ( $url != get_option( 'siteurl' ) )
                 update_option( 'siteurl', $url );
 }