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

Timestamp:

02/07/2010 10:36:37 PM (17 years ago)

Author:

westi

Message:

Switch to a constant for the fallback theme. See #9015.

File:

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

trunk/wp-includes/theme.php

@@ -952 +952 @@
         $template = locate_template(array("comments-popup.php"));
         if ('' == $template)
-                $template = get_theme_root() . '/default/comments-popup.php';
+                $template = get_theme_root() . '/' . WP_FALLBACK_THEME . '/comments-popup.php';
 
         return apply_filters('comments_popup_template', $template);
@@ -1161 +1161 @@
                 return true;
 
-        $fallback = 'twentyten';
-
-        if ( get_template() != $fallback && !file_exists(get_template_directory() . '/index.php') ) {
-                switch_theme($fallback, $fallback);
+        if ( get_template() != WP_FALLBACK_THEME && !file_exists(get_template_directory() . '/index.php') ) {
+                switch_theme( WP_FALLBACK_THEME, WP_FALLBACK_THEME );
                 return false;
         }
 
-        if ( get_stylesheet() != $fallback && !file_exists(get_template_directory() . '/style.css') ) {
-                switch_theme($fallback, $fallback);
+        if ( get_stylesheet() != WP_FALLBACK_THEME && !file_exists(get_template_directory() . '/style.css') ) {
+                switch_theme( WP_FALLBACK_THEME, WP_FALLBACK_THEME );
                 return false;
         }