Changeset 14485

Timestamp:

05/06/2010 07:53:40 PM (15 years ago)

Author:

nacin

Message:

Remove WP_FALLBACK_THEME, use WP_DEFAULT_THEME instead. We now only fall back to the default theme if the theme is broken. Incomplete themes that need to inherit templates will inherit them from wp-includes/theme-compat -- this behavior is deprecated. fixes #12846.

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (3 diffs)
• wp-includes/default-constants.php (modified) (2 diffs)
• wp-includes/theme.php (modified) (3 diffs)

trunk/wp-admin/includes/schema.php

@@ -652 +652 @@
     if ( $template != $stylesheet )
         $allowed_themes[ $template ] = true;
-    if ( WP_FALLBACK_THEME != $stylesheet && WP_FALLBACK_THEME != $template )
-        $allowed_themes[ WP_FALLBACK_THEME ] = true;
+    if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template )
+        $allowed_themes[ WP_DEFAULT_THEME ] = true;
 
     if ( 1 == $network_id ) {

trunk/wp-admin/includes/upgrade.php

@@ -1624 +1624 @@
             $index = implode('', file("$oldpath/$oldfile"));
             if (strpos($index, 'WP_USE_THEMES') !== false) {
-                if (! @copy(WP_CONTENT_DIR . '/themes/'.WP_FALLBACK_THEME.'/index.php', "$site_dir/$newfile"))
+                if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile"))
                     return false;
                 continue; // Don't copy anything
@@ -1684 +1684 @@
 function make_site_theme_from_default($theme_name, $template) {
     $site_dir = WP_CONTENT_DIR . "/themes/$template";
-    $default_dir = WP_CONTENT_DIR . '/themes/'.WP_FALLBACK_THEME;
+    $default_dir = WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME;
 
     // Copy files from the default theme to the site theme.
@@ -1780 +1780 @@
     // Make the new site theme active.
     $current_template = __get_option('template');
-    if ($current_template == WP_FALLBACK_THEME) {
+    if ($current_template == WP_DEFAULT_THEME) {
         update_option('template', $template);
         update_option('stylesheet', $template);

trunk/wp-includes/default-constants.php

@@ -287 +287 @@
      * Slug of the default theme for this install.
      * Used as the default theme when installing new sites.
+     * Will be used as the fallback if the current theme doesn't exist. 
      * @since 3.0.0
      */
@@ -292 +293 @@
         define( 'WP_DEFAULT_THEME', 'twentyten' );
 
-    /**
-     * Slug of the fallback theme for this install.
-     * Will be used as the fallback if the current theme doesn't exist.
-     * @since 3.0.0
-     */
-    if ( !defined('WP_FALLBACK_THEME') )
-        define( 'WP_FALLBACK_THEME', WP_DEFAULT_THEME );
 }
 

trunk/wp-includes/theme.php

@@ -1208 +1208 @@
  * Checks that current theme files 'index.php' and 'style.css' exists.
  *
- * Does not check the fallback theme. The fallback theme should always exist.
+ * Does not check the default theme, which is the fallback and should always exist.
  * Will switch theme to the fallback theme if current theme does not validate.
  * You can use the 'validate_current_theme' filter to return FALSE to
@@ -1214 +1214 @@
  *
  * @since 1.5.0
- * @see WP_FALLBACK_THEME
+ * @see WP_DEFAULT_THEME
  *
  * @return bool
@@ -1223 +1223 @@
         return true;
 
-    if ( get_template() != WP_FALLBACK_THEME && !file_exists(get_template_directory() . '/index.php') ) {
-        switch_theme( WP_FALLBACK_THEME, WP_FALLBACK_THEME );
+    if ( get_template() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/index.php') ) {
+        switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
         return false;
     }
 
-    if ( get_stylesheet() != WP_FALLBACK_THEME && !file_exists(get_template_directory() . '/style.css') ) {
-        switch_theme( WP_FALLBACK_THEME, WP_FALLBACK_THEME );
+    if ( get_stylesheet() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/style.css') ) {
+        switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
         return false;
     }