Changeset 45581

Timestamp:

07/01/2019 08:22:31 AM (5 years ago)

Author:

pento

Message:

Coding Standards: Fix the Squiz.PHP.DisallowMultipleAssignments violations in the default themes.

See #47632

Location:

trunk/src/wp-content/themes

Files:

• twentyeleven/header.php (modified) (2 diffs)
• twentyeleven/inc/theme-options.php (modified) (2 diffs)
• twentyeleven/inc/widgets.php (modified) (1 diff)
• twentyfifteen/inc/template-tags.php (modified) (2 diffs)
• twentyfourteen/inc/template-tags.php (modified) (1 diff)
• twentysixteen/inc/template-tags.php (modified) (1 diff)
• twentyten/header.php (modified) (1 diff)
• twentyten/loop.php (modified) (1 diff)

trunk/src/wp-content/themes/twentyeleven/header.php

@@ -103 +103 @@
                  * Check if this is a post or page, if it has a thumbnail, and if it's a big one
                  */
-                if ( is_singular() && has_post_thumbnail( $post->ID ) &&
-                        ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) ) ) &&
-                        $image[1] >= $header_image_width ) :
-                    // Houston, we have a new header image!
-                    echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
-                else :
+                if ( is_singular() && has_post_thumbnail( $post->ID ) ) {
+                    $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) );
+                    if ( $image && $image[1] >= $header_image_width ) {
+                        // Houston, we have a new header image!
+                        echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
+                    }
+                } else {
                     // Compatibility with versions of WordPress prior to 3.4.
                     if ( function_exists( 'get_custom_header' ) ) {
@@ -119 +120 @@
                     ?>
                     <img src="<?php header_image(); ?>" width="<?php echo esc_attr( $header_image_width ); ?>" height="<?php echo esc_attr( $header_image_height ); ?>" alt="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" />
-                <?php endif; // end check for featured image or standard header ?>
+                    <?php
+                } // end check for featured image or standard header
+                ?>
             </a>
             <?php endif; // end check for removed header image ?>

trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php

@@ -366 +366 @@
  */
 function twentyeleven_theme_options_validate( $input ) {
-    $output = $defaults = twentyeleven_get_default_theme_options();
+    $defaults = twentyeleven_get_default_theme_options();
+    $output   = $defaults;
 
     // Color scheme must be in our array of color scheme options
@@ -374 +375 @@
 
     // Our defaults for the link color may have changed, based on the color scheme.
-    $output['link_color'] = $defaults['link_color'] = twentyeleven_get_default_link_color( $output['color_scheme'] );
+    $defaults['link_color'] = twentyeleven_get_default_link_color( $output['color_scheme'] );
+    $output['link_color']   = $defaults['link_color'];
 
     // Link color must be 3 or 6 hexadecimal characters

trunk/src/wp-content/themes/twentyeleven/inc/widgets.php

@@ -77 +77 @@
         }
 
-        if ( ! $args['number'] = absint( $instance['number'] ) ) {
+        $args['number'] = absint( $instance['number'] );
+        if ( ! $args['number'] ) {
             $args['number'] = 10;
         }

trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php

@@ -24 +24 @@
         <div class="nav-links">
             <?php
-            if ( $prev_link = get_previous_comments_link( __( 'Older Comments', 'twentyfifteen' ) ) ) :
+            $prev_link = get_previous_comments_link( __( 'Older Comments', 'twentyfifteen' ) );
+            if ( $prev_link ) {
                 printf( '<div class="nav-previous">%s</div>', $prev_link );
-                endif;
-
-            if ( $next_link = get_next_comments_link( __( 'Newer Comments', 'twentyfifteen' ) ) ) :
+            }
+
+            $next_link = get_next_comments_link( __( 'Newer Comments', 'twentyfifteen' ) );
+            if ( $next_link ) {
                 printf( '<div class="nav-next">%s</div>', $next_link );
-                endif;
+            }
             ?>
             </div><!-- .nav-links -->
@@ -142 +144 @@
  */
 function twentyfifteen_categorized_blog() {
-    if ( false === ( $all_the_cool_cats = get_transient( 'twentyfifteen_categories' ) ) ) {
+    $all_the_cool_cats = get_transient( 'twentyfifteen_categories' );
+    if ( false === $all_the_cool_cats ) {
         // Create an array of all the categories that are attached to posts.
         $all_the_cool_cats = get_categories(

trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php

@@ -132 +132 @@
  */
 function twentyfourteen_categorized_blog() {
-    if ( false === ( $all_the_cool_cats = get_transient( 'twentyfourteen_category_count' ) ) ) {
+    $all_the_cool_cats = get_transient( 'twentyfourteen_category_count' );
+    if ( false === $all_the_cool_cats ) {
         // Create an array of all the categories that are attached to posts
         $all_the_cool_cats = get_categories(

trunk/src/wp-content/themes/twentysixteen/inc/template-tags.php

@@ -210 +210 @@
      */
     function twentysixteen_categorized_blog() {
-        if ( false === ( $all_the_cool_cats = get_transient( 'twentysixteen_categories' ) ) ) {
+        $all_the_cool_cats = get_transient( 'twentysixteen_categories' );
+        if ( false === $all_the_cool_cats ) {
             // Create an array of all the categories that are attached to posts.
             $all_the_cool_cats = get_categories(

trunk/src/wp-content/themes/twentyten/header.php

@@ -86 +86 @@
                 }
 
-                    // Check if this is a post or page, if it has a thumbnail, and if it's a big one
-                if ( is_singular() && current_theme_supports( 'post-thumbnails' ) &&
-                            has_post_thumbnail( $post->ID ) &&
-                            ( /* $src, $width, $height */ $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), 'post-thumbnail' ) ) &&
-                            $image[1] >= $header_image_width ) :
-                    // Houston, we have a new header image!
-                    echo get_the_post_thumbnail( $post->ID );
-                    elseif ( get_header_image() ) :
-                        // Compatibility with versions of WordPress prior to 3.4.
-                        if ( function_exists( 'get_custom_header' ) ) {
-                            $header_image_width  = get_custom_header()->width;
-                            $header_image_height = get_custom_header()->height;
-                        } else {
-                            $header_image_width  = HEADER_IMAGE_WIDTH;
-                            $header_image_height = HEADER_IMAGE_HEIGHT;
-                        }
-                        ?>
-                        <img src="<?php header_image(); ?>" width="<?php echo esc_attr( $header_image_width ); ?>" height="<?php echo esc_attr( $header_image_height ); ?>" alt="" />
-                    <?php endif; ?>
+                // Check if this is a post or page, if it has a thumbnail, and if it's a big one
+                if ( is_singular() && has_post_thumbnail( $post->ID ) ) {
+                    $image = wp_get_attachment_image_src( get_post_thumbnail_id( $post->ID ), array( $header_image_width, $header_image_width ) );
+                    if ( $image && $image[1] >= $header_image_width ) {
+                        // Houston, we have a new header image!
+                        echo get_the_post_thumbnail( $post->ID, 'post-thumbnail' );
+                    }
+                } else {
+                    // Compatibility with versions of WordPress prior to 3.4.
+                    if ( function_exists( 'get_custom_header' ) ) {
+                        $header_image_width  = get_custom_header()->width;
+                        $header_image_height = get_custom_header()->height;
+                    } else {
+                        $header_image_width  = HEADER_IMAGE_WIDTH;
+                        $header_image_height = HEADER_IMAGE_HEIGHT;
+                    }
+                    ?>
+                    <img src="<?php header_image(); ?>" width="<?php echo esc_attr( $header_image_width ); ?>" height="<?php echo esc_attr( $header_image_height ); ?>" alt="" />
+                    <?php
+                } // end check for featured image or standard header
+                ?>
             </div><!-- #branding -->
 

trunk/src/wp-content/themes/twentyten/loop.php

@@ -99 +99 @@
 
             <div class="entry-utility">
-            <?php if ( function_exists( 'get_post_format' ) && 'gallery' == get_post_format( $post->ID ) ) : ?>
+            <?php
+            $gallery = get_term_by( 'slug', _x( 'gallery', 'gallery category slug', 'twentyten' ), 'category' );
+            if ( function_exists( 'get_post_format' ) && 'gallery' == get_post_format( $post->ID ) ) :
+                ?>
                 <a href="<?php echo esc_url( get_post_format_link( 'gallery' ) ); ?>" title="<?php esc_attr_e( 'View Galleries', 'twentyten' ); ?>"><?php _e( 'More Galleries', 'twentyten' ); ?></a>
                 <span class="meta-sep">|</span>
-            <?php elseif ( $gallery = get_term_by( 'slug', _x( 'gallery', 'gallery category slug', 'twentyten' ), 'category' ) && in_category( $gallery->term_id ) ) : ?>
+            <?php elseif ( $gallery && in_category( $gallery->term_id ) ) : ?>
                 <a href="<?php echo esc_url( get_category_link( $gallery ) ); ?>" title="<?php esc_attr_e( 'View posts in the Gallery category', 'twentyten' ); ?>"><?php _e( 'More Galleries', 'twentyten' ); ?></a>
                 <span class="meta-sep">|</span>