Changeset 4017

Timestamp:

07/11/2006 10:44:56 PM (19 years ago)

Author:

ryan

Message:

Tweak theme validation.

Location:

trunk

Files:

• wp-admin/admin-functions.php (modified) (1 diff)
• wp-includes/theme.php (modified) (2 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/admin-functions.php

@@ -1255 +1255 @@
 }
 
-function validate_current_theme() {
-    $theme_loc = 'wp-content/themes';
-    $theme_root = ABSPATH.$theme_loc;
-
-    $template = get_settings('template');
-    $stylesheet = get_settings('stylesheet');
-
-    if (($template != 'default') && (!file_exists("$theme_root/$template/index.php"))) {
-        update_option('template', 'default');
-        update_option('stylesheet', 'default');
-        do_action('switch_theme', 'Default');
-        return false;
-    }
-
-    if (($stylesheet != 'default') && (!file_exists("$theme_root/$stylesheet/style.css"))) {
-        update_option('template', 'default');
-        update_option('stylesheet', 'default');
-        do_action('switch_theme', 'Default');
-        return false;
-    }
-
-    return true;
-}
-
 function get_broken_themes() {
     global $wp_broken_themes;

trunk/wp-includes/theme.php

@@ -27 +27 @@
 
 function get_template() {
-    $template = get_settings('template');
-    if (!file_exists(get_theme_root() . "/$template")) { //works for dirs too
-        update_option('template', 'default');
-        update_option('stylesheet', 'default');
-    }
     return apply_filters('template', get_settings('template'));
 }
@@ -375 +370 @@
 }
 
+function validate_current_theme() {
+    if ((get_template() != 'default') && (!file_exists(get_template_directory() . '/index.php'))) {
+        update_option('template', 'default');
+        update_option('stylesheet', 'default');
+        do_action('switch_theme', 'Default');
+        return false;
+    }
+
+    if ((get_stylesheet() != 'default') && (!file_exists(get_template_directory() . '/style.css'))) {
+        update_option('template', 'default');
+        update_option('stylesheet', 'default');
+        do_action('switch_theme', 'Default');
+        return false;
+    }
+
+    return true;
+}
+
 ?>

trunk/wp-settings.php

@@ -201 +201 @@
 $wp         = new WP();
 
+validate_current_theme();
 define('TEMPLATEPATH', get_template_directory());