WordPress.org

Make WordPress Core


Ignore:
Timestamp:
11/26/2017 11:56:25 PM (22 months ago)
Author:
pento
Message:

General: Fix some precision alignment formatting warnings.

The WPCS WordPress.WhiteSpace.PrecisionAlignment rule throws warnings for a bunch of code that will likely cause issues for wpcbf. Fixing these manually beforehand gives us better auto-fixed results later.

See #41057.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/class-wp.php

    r42201 r42228  
    411411            // We're showing a feed, so WP is indeed the only thing that last changed.
    412412            if ( ! empty( $this->query_vars['withcomments'] )
    413                  || false !== strpos( $this->query_vars['feed'], 'comments-' )
    414                  || ( empty( $this->query_vars['withoutcomments'] )
    415                       && ( ! empty( $this->query_vars['p'] )
    416                            || ! empty( $this->query_vars['name'] )
    417                            || ! empty( $this->query_vars['page_id'] )
    418                            || ! empty( $this->query_vars['pagename'] )
    419                            || ! empty( $this->query_vars['attachment'] )
    420                            || ! empty( $this->query_vars['attachment_id'] )
    421                       )
    422                  )
     413                || false !== strpos( $this->query_vars['feed'], 'comments-' )
     414                || ( empty( $this->query_vars['withoutcomments'] )
     415                    && ( ! empty( $this->query_vars['p'] )
     416                        || ! empty( $this->query_vars['name'] )
     417                        || ! empty( $this->query_vars['page_id'] )
     418                        || ! empty( $this->query_vars['pagename'] )
     419                        || ! empty( $this->query_vars['attachment'] )
     420                        || ! empty( $this->query_vars['attachment_id'] )
     421                    )
     422                )
    423423            ) {
    424424                $wp_last_modified = mysql2date( 'D, d M Y H:i:s', get_lastcommentmodified( 'GMT' ), false );
     
    450450
    451451            if ( ($client_last_modified && $client_etag) ?
    452                      (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) :
    453                      (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag)) ) {
     452                    (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) :
     453                    (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag)) ) {
    454454                $status = 304;
    455455                $exit_required = true;
Note: See TracChangeset for help on using the changeset viewer.