<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15736] trunk/wp-includes/theme.php:
Shift theme mods to be reliant on the theme slug instead of name.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15736">15736</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-06 21:00:17 +0000 (Wed, 06 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Shift theme mods to be reliant on the theme slug instead of name. fixes <a href="http://trac.wordpress.org/ticket/15048">#15048</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (15735 => 15736)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-10-06 19:02:43 UTC (rev 15735)
+++ trunk/wp-includes/theme.php 2010-10-06 21:00:17 UTC (rev 15736)
</span><span class="lines">@@ -1298,6 +1298,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * 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;
+}
+
+/**
</ins><span class="cx"> * Retrieve theme modification value for the current theme.
</span><span class="cx"> *
</span><span class="cx"> * If the modification name does not exist, then the $default will be passed
</span><span class="lines">@@ -1313,10 +1333,8 @@
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_theme_mod($name, $default = false) {
</span><del>- $theme = get_current_theme();
</del><ins>+ $mods = get_theme_mods();
</ins><span class="cx">
</span><del>- $mods = get_option( "mods_$theme" );
-
</del><span class="cx"> if ( isset($mods[$name]) )
</span><span class="cx"> return apply_filters( "theme_mod_$name", $mods[$name] );
</span><span class="cx">
</span><span class="lines">@@ -1332,14 +1350,13 @@
</span><span class="cx"> * @param string $value theme modification value.
</span><span class="cx"> */
</span><span class="cx"> function set_theme_mod($name, $value) {
</span><del>- $theme = get_current_theme();
</del><ins>+ $mods = get_theme_mods();
</ins><span class="cx">
</span><del>- $mods = get_option("mods_$theme");
-
</del><span class="cx"> $mods[$name] = $value;
</span><span class="cx">
</span><del>- update_option("mods_$theme", $mods);
- wp_cache_delete("mods_$theme", 'options');
</del><ins>+ $theme = get_option( 'stylesheet' );
+ update_option( "theme_mods_$theme", $mods );
+ wp_cache_delete( "theme_mods_$theme", 'options' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1354,10 +1371,8 @@
</span><span class="cx"> * @return null
</span><span class="cx"> */
</span><span class="cx"> function remove_theme_mod( $name ) {
</span><del>- $theme = get_current_theme();
</del><ins>+ $mods = get_theme_mods();
</ins><span class="cx">
</span><del>- $mods = get_option("mods_$theme");
-
</del><span class="cx"> if ( !isset($mods[$name]) )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1366,8 +1381,9 @@
</span><span class="cx"> if ( empty($mods) )
</span><span class="cx"> return remove_theme_mods();
</span><span class="cx">
</span><del>- update_option("mods_$theme", $mods);
- wp_cache_delete("mods_$theme", 'options');
</del><ins>+ $theme = get_option( 'stylesheet' );
+ update_option( "theme_mods_$theme", $mods );
+ wp_cache_delete( "theme_mods_$theme", 'options' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1376,9 +1392,8 @@
</span><span class="cx"> * @since 2.1.0
</span><span class="cx"> */
</span><span class="cx"> function remove_theme_mods() {
</span><del>- $theme = get_current_theme();
-
- delete_option("mods_$theme");
</del><ins>+ delete_option( 'theme_mods_' . get_option( 'stylesheet' ) );
+ delete_option( 'mods_' . get_current_theme() );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>