Changeset 33815

Timestamp:

08/30/2015 09:44:38 PM (9 years ago)

Author:

obenland

Message:

Themes: Get the correct theme when template and stylesheet were both passed as arguments.

Fixes a bug where $new_theme got set before the second argument was
appropriately handled, causing the current_theme option to later always be
updated to the parent theme's name.

Introduced in [21131].

Props obenland, wonderboymusic.
Fixes #32635.

Location:

trunk

Files:

• src/wp-includes/theme.php (modified) (1 diff)
• tests/phpunit/tests/theme.php (modified) (1 diff)

trunk/src/wp-includes/theme.php

@@ -691 +691 @@
     $nav_menu_locations = get_theme_mod( 'nav_menu_locations' );
 
-    $old_theme  = wp_get_theme();
+    if ( func_num_args() > 1 ) {
+        $stylesheet = func_get_arg( 1 );
+    }
+
+    $old_theme = wp_get_theme();
     $new_theme = wp_get_theme( $stylesheet );
-
-    if ( func_num_args() > 1 ) {
-        $template = $stylesheet;
-        $stylesheet = func_get_arg( 1 );
-    } else {
-        $template = $new_theme->get_template();
-    }
+    $template  = $new_theme->get_template();
 
     update_option( 'template', $template );

trunk/tests/phpunit/tests/theme.php

@@ -86 +86 @@
         // Generic tests that should hold true for any theme
         foreach ( $themes as $k => $theme ) {
+            // Don't run these checks for custom themes.
+            if ( empty( $theme['Author'] ) || false === strpos( $theme['Author'], 'WordPress' ) ) {
+                continue;
+            }
+
             $this->assertEquals( $theme['Name'], $k );
             $this->assertNotEmpty( $theme['Title'] );