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

Timestamp:

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

Author:

pento

Message:

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

See #47632.

File:

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

trunk/src/wp-includes/theme.php

@@ -80 +80 @@
             $themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ];
         } else {
-            $themes[ $theme ] = $_themes[ $theme_root['theme_root'] . '/' . $theme ] = new WP_Theme( $theme, $theme_root['theme_root'] );
+            $themes[ $theme ]                                    = new WP_Theme( $theme, $theme_root['theme_root'] );
+            $_themes[ $theme_root['theme_root'] . '/' . $theme ] = $themes[ $theme ];
         }
     }
@@ -464 +465 @@
      * @param string $cache_directory  Directory to be searched for the cache.
      */
-    if ( $cache_expiration = apply_filters( 'wp_cache_themes_persistently', false, 'search_theme_directories' ) ) {
+    $cache_expiration = apply_filters( 'wp_cache_themes_persistently', false, 'search_theme_directories' );
+    if ( $cache_expiration ) {
         $cached_roots = get_site_transient( 'theme_roots' );
         if ( is_array( $cached_roots ) ) {
@@ -571 +573 @@
     global $wp_theme_directories;
 
-    if ( $stylesheet_or_template && $theme_root = get_raw_theme_root( $stylesheet_or_template ) ) {
-        // Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
-        // This gives relative theme roots the benefit of the doubt when things go haywire.
-        if ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) {
-            $theme_root = WP_CONTENT_DIR . $theme_root;
-        }
-    } else {
+    $theme_root = '';
+
+    if ( $stylesheet_or_template ) {
+        $theme_root = get_raw_theme_root( $stylesheet_or_template );
+        if ( $theme_root ) {
+            // Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
+            // This gives relative theme roots the benefit of the doubt when things go haywire.
+            if ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) {
+                $theme_root = WP_CONTENT_DIR . $theme_root;
+            }
+        }
+    }
+
+    if ( ! $theme_root ) {
         $theme_root = WP_CONTENT_DIR . '/themes';
     }
@@ -1313 +1322 @@
         $data = get_theme_mod( 'header_image_data' );
         if ( ! $data && current_theme_supports( 'custom-header', 'default-image' ) ) {
-            $directory_args = array( get_template_directory_uri(), get_stylesheet_directory_uri() );
-            $data           = array();
-            $data['url']    = $data['thumbnail_url'] = vsprintf( get_theme_support( 'custom-header', 'default-image' ), $directory_args );
+            $directory_args        = array( get_template_directory_uri(), get_stylesheet_directory_uri() );
+            $data                  = array();
+            $data['url']           = vsprintf( get_theme_support( 'custom-header', 'default-image' ), $directory_args );
+            $data['thumbnail_url'] = $data['url'];
             if ( ! empty( $_wp_default_headers ) ) {
                 foreach ( (array) $_wp_default_headers as $default_header ) {
@@ -2901 +2911 @@
  */
 function check_theme_switched() {
-    if ( $stylesheet = get_option( 'theme_switched' ) ) {
+    $stylesheet = get_option( 'theme_switched' );
+    if ( $stylesheet ) {
         $old_theme = wp_get_theme( $stylesheet );