Changeset 21131 for trunk/wp-includes/theme.php

Timestamp:

06/26/2012 05:21:04 AM (12 years ago)

Author:

nacin

Message:

Allow switch_theme() to take a single $stylesheet argument.

It now effectively has two function definitions:
function switch_theme( $stylesheet )
function switch_theme( $template, $stylesheet )

fixes #21075.

File:

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

trunk/wp-includes/theme.php

@@ -651 +651 @@
 
 /**
- * Switches current theme to new template and stylesheet names.
+ * Switches the theme.
+ *
+ * Accepts one argument: $stylesheet of the theme. It also accepts an additional function signature
+ * of two arguments: $template then $stylesheet. This is for backwards compatibility.
  *
  * @since 2.5.0
  * @uses do_action() Calls 'switch_theme' action, passing the new theme.
  *
- * @param string $template Template name
- * @param string $stylesheet Stylesheet name.
- */
-function switch_theme( $template, $stylesheet ) {
+ * @param string $stylesheet Stylesheet name
+ */
+function switch_theme( $stylesheet ) {
     global $wp_theme_directories, $sidebars_widgets;
 
@@ -667 +669 @@
     $old_theme  = wp_get_theme();
     $new_theme = wp_get_theme( $stylesheet );
-    $new_name  = $new_theme->get('Name');
+
+    if ( func_num_args() > 1 ) {
+        $template = $stylesheet;
+        $stylesheet = func_get_arg( 1 );
+    } else {
+        $template = $new_theme->get_template();
+    }
 
     update_option( 'template', $template );
@@ -676 +684 @@
         update_option( 'stylesheet_root', get_raw_theme_root( $stylesheet, true ) );
     }
+
+    $new_name  = $new_theme->get('Name');
 
     update_option( 'current_theme', $new_name );
@@ -707 +717 @@
 
     if ( get_template() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/index.php') ) {
-        switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
+        switch_theme( WP_DEFAULT_THEME );
         return false;
     }
 
     if ( get_stylesheet() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/style.css') ) {
-        switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
+        switch_theme( WP_DEFAULT_THEME );
         return false;
     }
 
     if ( is_child_theme() && ! file_exists( get_stylesheet_directory() . '/style.css' ) ) {
-        switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
+        switch_theme( WP_DEFAULT_THEME );
         return false;
     }