Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Shift theme mods to be reliant on the theme slug instead of name. fixes #15048. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@15736 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-10-06 21:00:17 +00:00
parent 36e537424d
commit 50120d23da
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
wp-includes/theme.php
View File

@ -1297,6 +1297,26 @@ function validate_current_theme() {
return true;
}
/**
* Retrieve all theme modifications.
*
* @since 3.1.0
*
* @return mixed Theme modifications value.
*/
function get_theme_mods() {
$theme_slug = get_option( 'stylesheet' );
if ( false === ( $mods = get_option( "theme_mods_$theme_slug" ) ) ) {
$theme_name = get_current_theme();
$mods = get_option( "mods_$theme_name" );
if ( is_admin() && false !== $mods ) {
update_option( "theme_mods_$theme_slug", $mods );
delete_option( "mods_$theme_name" );
}
}
return $mods;
}
/**
* Retrieve theme modification value for the current theme.
*
@ -1313,9 +1333,7 @@ function validate_current_theme() {
* @return string
*/
function get_theme_mod($name, $default = false) {
$theme = get_current_theme();
$mods = get_option( "mods_$theme" );
$mods = get_theme_mods();
if ( isset($mods[$name]) )
return apply_filters( "theme_mod_$name", $mods[$name] );
@ -1332,14 +1350,13 @@ function get_theme_mod($name, $default = false) {
* @param string $value theme modification value.
*/
function set_theme_mod($name, $value) {
$theme = get_current_theme();
$mods = get_option("mods_$theme");
$mods = get_theme_mods();
$mods[$name] = $value;
update_option("mods_$theme", $mods);
wp_cache_delete("mods_$theme", 'options');
$theme = get_option( 'stylesheet' );
update_option( "theme_mods_$theme", $mods );
wp_cache_delete( "theme_mods_$theme", 'options' );
}
/**
@ -1354,9 +1371,7 @@ function set_theme_mod($name, $value) {
* @return null
*/
function remove_theme_mod( $name ) {
$theme = get_current_theme();
$mods = get_option("mods_$theme");
$mods = get_theme_mods();
if ( !isset($mods[$name]) )
return;
@ -1366,8 +1381,9 @@ function remove_theme_mod( $name ) {
if ( empty($mods) )
return remove_theme_mods();
update_option("mods_$theme", $mods);
wp_cache_delete("mods_$theme", 'options');
$theme = get_option( 'stylesheet' );
update_option( "theme_mods_$theme", $mods );
wp_cache_delete( "theme_mods_$theme", 'options' );
}
/**
@ -1376,9 +1392,8 @@ function remove_theme_mod( $name ) {
* @since 2.1.0
*/
function remove_theme_mods() {
$theme = get_current_theme();
delete_option("mods_$theme");
delete_option( 'theme_mods_' . get_option( 'stylesheet' ) );
delete_option( 'mods_' . get_current_theme() );
}
/**