Changeset 15736

Timestamp:

10/06/2010 09:00:17 PM (13 years ago)

Author:

nacin

Message:

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

File:

• trunk/wp-includes/theme.php (modified) (6 diffs)

trunk/wp-includes/theme.php

@@ -1299 +1299 @@
 
 /**
+ * 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.
  *
@@ -1314 +1334 @@
  */
 function get_theme_mod($name, $default = false) {
-    $theme = get_current_theme();
-
-    $mods = get_option( "mods_$theme" );
+    $mods = get_theme_mods();
 
     if ( isset($mods[$name]) )
@@ -1333 +1351 @@
  */
 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' );
 }
 
@@ -1355 +1372 @@
  */
 function remove_theme_mod( $name ) {
-    $theme = get_current_theme();
-
-    $mods = get_option("mods_$theme");
+    $mods = get_theme_mods();
 
     if ( !isset($mods[$name]) )
@@ -1367 +1382 @@
         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' );
 }
 
@@ -1377 +1393 @@
  */
 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() );
 }