sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@14485 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2010-05-06 19:53:40 +00:00
parent 51aa71c394
commit 910c8e8bc9
4 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/schema.php
View File

@ -651,8 +651,8 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
$allowed_themes = array( $stylesheet => true ); $allowed_themes = array( $stylesheet => true );
if ( $template != $stylesheet ) if ( $template != $stylesheet )
$allowed_themes[ $template ] = true; $allowed_themes[ $template ] = true;
if ( WP_FALLBACK_THEME != $stylesheet && WP_FALLBACK_THEME != $template ) if ( WP_DEFAULT_THEME != $stylesheet && WP_DEFAULT_THEME != $template )
$allowed_themes[ WP_FALLBACK_THEME ] = true; $allowed_themes[ WP_DEFAULT_THEME ] = true;
if ( 1 == $network_id ) { if ( 1 == $network_id ) {
$wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path ) ); $wpdb->insert( $wpdb->site, array( 'domain' => $domain, 'path' => $path ) );

6
wp-admin/includes/upgrade.php
View File

@ -1623,7 +1623,7 @@ function make_site_theme_from_oldschool($theme_name, $template) {
if ($oldfile == 'index.php') { // Check to make sure it's not a new index if ($oldfile == 'index.php') { // Check to make sure it's not a new index
$index = implode('', file("$oldpath/$oldfile")); $index = implode('', file("$oldpath/$oldfile"));
if (strpos($index, 'WP_USE_THEMES') !== false) { 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; return false;
continue; // Don't copy anything continue; // Don't copy anything
} }
@ -1683,7 +1683,7 @@ function make_site_theme_from_oldschool($theme_name, $template) {
*/ */
function make_site_theme_from_default($theme_name, $template) { function make_site_theme_from_default($theme_name, $template) {
$site_dir = WP_CONTENT_DIR . "/themes/$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. // 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'); //$files = array('index.php', 'comments.php', 'comments-popup.php', 'footer.php', 'header.php', 'sidebar.php', 'style.css');
@ -1779,7 +1779,7 @@ function make_site_theme() {
// Make the new site theme active. // Make the new site theme active.
$current_template = __get_option('template'); $current_template = __get_option('template');
if ($current_template == WP_FALLBACK_THEME) { if ($current_template == WP_DEFAULT_THEME) {
update_option('template', $template); update_option('template', $template);
update_option('stylesheet', $template); update_option('stylesheet', $template);
} }

8
wp-includes/default-constants.php
View File

@ -286,18 +286,12 @@ function wp_templating_constants( ) {
/** /**
* Slug of the default theme for this install. * Slug of the default theme for this install.
* Used as the default theme when installing new sites. * 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 * @since 3.0.0
*/ */
if ( !defined('WP_DEFAULT_THEME') ) if ( !defined('WP_DEFAULT_THEME') )
define( 'WP_DEFAULT_THEME', 'twentyten' ); 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 );
} }
?> ?>

12
wp-includes/theme.php
View File

@ -1207,13 +1207,13 @@ function switch_theme($template, $stylesheet) {
/** /**
* Checks that current theme files 'index.php' and 'style.css' exists. * 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. * 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 * You can use the 'validate_current_theme' filter to return FALSE to
* disable this functionality. * disable this functionality.
* *
* @since 1.5.0 * @since 1.5.0
* @see WP_FALLBACK_THEME * @see WP_DEFAULT_THEME
* *
* @return bool * @return bool
*/ */
@ -1222,13 +1222,13 @@ function validate_current_theme() {
if ( defined('WP_INSTALLING') || !apply_filters( 'validate_current_theme', true ) ) if ( defined('WP_INSTALLING') || !apply_filters( 'validate_current_theme', true ) )
return true; return true;
if ( get_template() != WP_FALLBACK_THEME && !file_exists(get_template_directory() . '/index.php') ) { if ( get_template() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/index.php') ) {
switch_theme( WP_FALLBACK_THEME, WP_FALLBACK_THEME ); switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
return false; return false;
} }
if ( get_stylesheet() != WP_FALLBACK_THEME && !file_exists(get_template_directory() . '/style.css') ) { if ( get_stylesheet() != WP_DEFAULT_THEME && !file_exists(get_template_directory() . '/style.css') ) {
switch_theme( WP_FALLBACK_THEME, WP_FALLBACK_THEME ); switch_theme( WP_DEFAULT_THEME, WP_DEFAULT_THEME );
return false; return false;
} }