WordPress.org

Make WordPress Core

Changeset 14080


Ignore:
Timestamp:
04/13/10 21:56:57 (5 years ago)
Author:
ryan
Message:

Use WP_FALLBACK_THEME instead of default. Props MichaelH. see #12846

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/upgrade.php

    r14060 r14080  
    16141614            $index = implode('', file("$oldpath/$oldfile")); 
    16151615            if (strpos($index, 'WP_USE_THEMES') !== false) { 
    1616                 if (! @copy(WP_CONTENT_DIR . '/themes/default/index.php', "$site_dir/$newfile")) 
     1616                if (! @copy(WP_CONTENT_DIR . '/themes/'.WP_FALLBACK_THEME.'/index.php', "$site_dir/$newfile")) 
    16171617                    return false; 
    16181618                continue; // Don't copy anything 
     
    16741674function make_site_theme_from_default($theme_name, $template) { 
    16751675    $site_dir = WP_CONTENT_DIR . "/themes/$template"; 
    1676     $default_dir = WP_CONTENT_DIR . '/themes/default'; 
     1676    $default_dir = WP_CONTENT_DIR . '/themes/'.WP_FALLBACK_THEME; 
    16771677 
    16781678    // Copy files from the default theme to the site theme. 
     
    17701770    // Make the new site theme active. 
    17711771    $current_template = __get_option('template'); 
    1772     if ($current_template == 'default') { 
     1772    if ($current_template == WP_FALLBACK_THEME) { 
    17731773        update_option('template', $template); 
    17741774        update_option('stylesheet', $template); 
  • trunk/wp-includes/comment-template.php

    r14073 r14080  
    891891        require( TEMPLATEPATH .  $file ); 
    892892    else 
    893         require( get_theme_root() . '/default/comments.php'); 
     893        require( get_theme_root() . '/'.WP_FALLBACK_THEME.'/comments.php'); 
    894894} 
    895895 
Note: See TracChangeset for help on using the changeset viewer.