Changeset 6334

Timestamp:

11/13/07 05:07:44 (1 year ago)

Author:

ryan

Message:

Add switch_theme(). Cache current theme in options to avoid calling get_themes(). fixes #5346

Files:

• trunk/wp-admin/themes.php (modified) (1 diff)
• trunk/wp-includes/theme.php (modified) (4 diffs)

trunk/wp-admin/themes.php

@@ -6 +6 @@
-
-    if ('activate' == $_GET['action']) {
-
-
-
-
-
-
-
-
+
-        wp_redirect('themes.php?activated=true');
-        exit;

trunk/wp-includes/theme.php

@@ -295 +295 @@
-
-function get_current_theme() {
+    if ( $theme = get_option('current_theme') )
+        return $theme;
+
-    $themes = get_themes();
-    $theme_names = array_keys($themes);
@@ -310 +313 @@
-        }
-    }
+
+    update_option('current_theme', $current_theme);
-
-    return $current_theme;
@@ -448 +453 @@
-}
-
+function switch_theme($template, $stylesheet) {
+    update_option('template', $template);
+    update_option('stylesheet', $stylesheet);
+    delete_option('current_theme');
+    $theme = get_current_theme();
+    do_action('switch_theme', $theme);
+}
+
-function validate_current_theme() {
-    // Don't validate during an install/upgrade.
@@ -454 +467 @@
-
-    if ( get_template() != 'default' && !file_exists(get_template_directory() . '/index.php') ) {
-
-
-
+
-        return false;
-    }
-
-    if ( get_stylesheet() != 'default' && !file_exists(get_template_directory() . '/style.css') ) {
-
-
-
+
-        return false;
-    }