WordPress.org

Make WordPress Core

Ticket #42297: 42297.diff

File 42297.diff, 6.2 KB (added by Presskopp, 21 months ago)
  • src/wp-admin/nav-menus.php

     
    611611                if ( 1 == $num_locations ) {
    612612                        echo '<p>' . __( 'Your theme supports one menu. Select which menu you would like to use.' ) . '</p>';
    613613                } else {
    614                         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>';
     614                        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>';
    615615                }
    616616        ?>
    617617        <div id="menu-locations-wrap">
  • src/wp-includes/class-pop3.php

     
    318318        if(!$this->is_ok($reply))
    319319        {
    320320            $reply = $this->strip_clf($reply);
    321             $this->ERROR = "POP3 pop_list: " . _("Error ") .  "[$reply]";
     321            $this->ERROR = "POP3 pop_list: " . _("Error ") . "[$reply]";
    322322            return false;
    323323        }
    324324        $MsgArray = array();
  • src/wp-includes/class-wp-text-diff-renderer-table.php

     
    210210                                $line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'unchanged' );
    211211                        }
    212212                        if (  $this->_show_split_view ) {
    213                                 $r .= '<tr>' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line )  . "</tr>\n";
     213                                $r .= '<tr>' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line ) . "</tr>\n";
    214214                        } else {
    215215                                $r .= '<tr>' . $this->contextLine( $line ) . "</tr>\n";
    216216                        }
  • src/wp-includes/comment-template.php

     
    21992199                'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
    22002200                            '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $aria_req . $html_req . ' /></p>',
    22012201                'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
    2202                             '<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>',
     2202                            '<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>',
    22032203                'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
    22042204                            '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
    22052205        );
  • src/wp-includes/http.php

     
    488488        $origin = get_http_origin();
    489489
    490490        if ( is_allowed_http_origin( $origin ) ) {
    491                 @header( 'Access-Control-Allow-Origin: ' .  $origin );
     491                @header( 'Access-Control-Allow-Origin: ' . $origin );
    492492                @header( 'Access-Control-Allow-Credentials: true' );
    493493                if ( 'OPTIONS' === $_SERVER['REQUEST_METHOD'] )
    494494                        exit;
  • src/wp-includes/post.php

     
    46624662                $hierarchical = false;
    46634663                $incpages = wp_parse_id_list( $r['include'] );
    46644664                if ( ! empty( $incpages ) ) {
    4665                         $inclusions = ' AND ID IN (' . implode( ',', $incpages ) .  ')';
     4665                        $inclusions = ' AND ID IN (' . implode( ',', $incpages ) . ')';
    46664666                }
    46674667        }
    46684668
     
    46704670        if ( ! empty( $exclude ) ) {
    46714671                $expages = wp_parse_id_list( $exclude );
    46724672                if ( ! empty( $expages ) ) {
    4673                         $exclusions = ' AND ID NOT IN (' . implode( ',', $expages ) .  ')';
     4673                        $exclusions = ' AND ID NOT IN (' . implode( ',', $expages ) . ')';
    46744674                }
    46754675        }
    46764676
  • src/wp-includes/wp-db.php

     
    10511051                                $message .= '<li>' . sprintf(
    10521052                                        /* translators: 1: database user, 2: database name */
    10531053                                        __( 'Does the user %1$s have permission to use the %2$s database?' ),
    1054                                         '<code>' . htmlspecialchars( $this->dbuser, ENT_QUOTES )  . '</code>',
     1054                                        '<code>' . htmlspecialchars( $this->dbuser, ENT_QUOTES ) . '</code>',
    10551055                                        '<code>' . htmlspecialchars( $db, ENT_QUOTES ) . '</code>'
    10561056                                ) . "</li>\n";
    10571057
  • src/wp-login.php

     
    424424        if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
    425425                $_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
    426426
    427         $url = dirname( set_url_scheme( 'http://' .  $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] ) );
     427        $url = dirname( set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] ) );
    428428        if ( $url != get_option( 'siteurl' ) )
    429429                update_option( 'siteurl', $url );
    430430}