Ticket #12846: 12846.diff

wp-admin/includes/upgrade.php

@@ -1613 +1613 @@
                 if ($oldfile == 'index.php') { // Check to make sure it's not a new index
                         $index = implode('', file("$oldpath/$oldfile"));
                         if (strpos($index, 'WP_USE_THEMES') !== false) {
-                                if (! @copy(WP_CONTENT_DIR . '/themes/default/index.php', "$site_dir/$newfile"))
+                                if (! @copy(WP_CONTENT_DIR . '/themes/'.WP_FALLBACK_THEME.'/index.php', "$site_dir/$newfile"))
                                         return false;
                                 continue; // Don't copy anything
                                 }
@@ -1673 +1673 @@
  */
 function make_site_theme_from_default($theme_name, $template) {
         $site_dir = WP_CONTENT_DIR . "/themes/$template";
-        $default_dir = WP_CONTENT_DIR . '/themes/default';
+        $default_dir = WP_CONTENT_DIR . '/themes/'.WP_FALLBACK_THEME;
 
         // Copy files from the default theme to the site theme.
         //$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css');
@@ -1769 +1769 @@
 
         // Make the new site theme active.
         $current_template = __get_option('template');
-        if ($current_template == 'default') {
+        if ($current_template == WP_FALLBACK_THEME) {
                 update_option('template', $template);
                 update_option('stylesheet', $template);
         }

wp-includes/comment-template.php

@@ -890 +890 @@
         elseif ( file_exists( TEMPLATEPATH . $file ) )
                 require( TEMPLATEPATH .  $file );
         else
-                require( get_theme_root() . '/default/comments.php');
+                require( get_theme_root() . '/'.WP_FALLBACK_THEME.'/comments.php');
 }
 
 /**