Changeset 45590 for trunk/src/wp-includes/class-wp-theme.php

Timestamp:

07/02/2019 11:41:16 PM (7 years ago)

Author:

pento

Message:

Coding Standards: Fix the Squiz.PHP.DisallowMultipleAssignments violations in wp-includes.

See #47632.

File:

• trunk/src/wp-includes/class-wp-theme.php (modified) (5 diffs)

trunk/src/wp-includes/class-wp-theme.php

@@ -263 +263 @@
                         // Default themes always trump their pretenders.
                         // Properly identify default themes that are inside a directory within wp-content/themes.
-                        if ( $default_theme_slug = array_search( $this->headers['Name'], self::$default_themes ) ) {
+                        $default_theme_slug = array_search( $this->headers['Name'], self::$default_themes );
+                        if ( $default_theme_slug ) {
                                 if ( basename( $this->stylesheet ) != $default_theme_slug ) {
                                         $this->headers['Name'] .= '/' . $this->stylesheet;
@@ -286 +287 @@
 
                 // (If template is set from cache [and there are no errors], we know it's good.)
-                if ( ! $this->template && ! ( $this->template = $this->headers['Template'] ) ) {
+                if ( ! $this->template ) {
+                        $this->template = $this->headers['Template'];
+                }
+
+                if ( ! $this->template ) {
                         $this->template = $this->stylesheet;
                         if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet . '/index.php' ) ) {
@@ -314 +319 @@
                         // If we're in a directory of themes inside /themes, look for the parent nearby.
                         // wp-content/themes/directory-of-themes/*
-                        $parent_dir = dirname( $this->stylesheet );
+                        $parent_dir  = dirname( $this->stylesheet );
+                        $directories = search_theme_directories();
                         if ( '.' != $parent_dir && file_exists( $this->theme_root . '/' . $parent_dir . '/' . $this->template . '/index.php' ) ) {
                                 $this->template = $parent_dir . '/' . $this->template;
-                        } elseif ( ( $directories = search_theme_directories() ) && isset( $directories[ $this->template ] ) ) {
+                        } elseif ( $directories && isset( $directories[ $this->template ] ) ) {
                                 // Look for the template in the search_theme_directories() results, in case it is in another theme root.
                                 // We don't look into directories of themes, just the theme root.
@@ -669 +675 @@
                         wp_cache_delete( $key . '-' . $this->cache_hash, 'themes' );
                 }
-                $this->template = $this->textdomain_loaded = $this->theme_root_uri = $this->parent = $this->errors = $this->headers_sanitized = $this->name_translated = null;
-                $this->headers  = array();
+                $this->template          = null;
+                $this->textdomain_loaded = null;
+                $this->theme_root_uri    = null;
+                $this->parent            = null;
+                $this->errors            = null;
+                $this->headers_sanitized = null;
+                $this->name_translated   = null;
+                $this->headers           = array();
                 $this->__construct( $this->stylesheet, $this->theme_root );
         }
@@ -1318 +1330 @@
                 }
 
-                $path = $this->get_stylesheet_directory();
-                if ( $domainpath = $this->get( 'DomainPath' ) ) {
+                $path       = $this->get_stylesheet_directory();
+                $domainpath = $this->get( 'DomainPath' );
+                if ( $domainpath ) {
                         $path .= $domainpath;
                 } else {