<!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>[15739] trunk/wp-includes/theme.php: Some doc updates.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15739">15739</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-07 05:59:50 +0000 (Thu, 07 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some doc updates. see <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 (15738 => 15739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-10-07 04:20:19 UTC (rev 15738)
+++ trunk/wp-includes/theme.php 2010-10-07 05:59:50 UTC (rev 15739)
</span><span class="lines">@@ -1302,13 +1302,13 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><del>- * @return mixed Theme modifications value.
</del><ins>+ * @return array Theme modifications.
</ins><span class="cx"> */
</span><span class="cx"> function get_theme_mods() {
</span><span class="cx"> $theme_slug = get_option( 'stylesheet' );
</span><span class="cx"> if ( false === ( $mods = get_option( "theme_mods_$theme_slug" ) ) ) {
</span><span class="cx"> $theme_name = get_current_theme();
</span><del>- $mods = get_option( "mods_$theme_name" );
</del><ins>+ $mods = get_option( "mods_$theme_name" ); // Deprecated location.
</ins><span class="cx"> if ( is_admin() && false !== $mods ) {
</span><span class="cx"> update_option( "theme_mods_$theme_slug", $mods );
</span><span class="cx"> delete_option( "mods_$theme_name" );
</span><span class="lines">@@ -1332,13 +1332,13 @@
</span><span class="cx"> * @param bool|string $default
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><del>-function get_theme_mod($name, $default = false) {
</del><ins>+function get_theme_mod( $name, $default = false ) {
</ins><span class="cx"> $mods = get_theme_mods();
</span><span class="cx">
</span><del>- if ( isset($mods[$name]) )
- return apply_filters( "theme_mod_$name", $mods[$name] );
</del><ins>+ if ( isset( $mods[ $name ] ) )
+ return apply_filters( "theme_mod_$name", $mods[ $name ] );
</ins><span class="cx">
</span><del>- return apply_filters( "theme_mod_$name", sprintf($default, get_template_directory_uri(), get_stylesheet_directory_uri()) );
</del><ins>+ return apply_filters( "theme_mod_$name", sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1349,10 +1349,10 @@
</span><span class="cx"> * @param string $name Theme modification name.
</span><span class="cx"> * @param string $value theme modification value.
</span><span class="cx"> */
</span><del>-function set_theme_mod($name, $value) {
</del><ins>+function set_theme_mod( $name, $value ) {
</ins><span class="cx"> $mods = get_theme_mods();
</span><span class="cx">
</span><del>- $mods[$name] = $value;
</del><ins>+ $mods[ $name ] = $value;
</ins><span class="cx">
</span><span class="cx"> $theme = get_option( 'stylesheet' );
</span><span class="cx"> update_option( "theme_mods_$theme", $mods );
</span><span class="lines">@@ -1373,12 +1373,12 @@
</span><span class="cx"> function remove_theme_mod( $name ) {
</span><span class="cx"> $mods = get_theme_mods();
</span><span class="cx">
</span><del>- if ( !isset($mods[$name]) )
</del><ins>+ if ( ! isset( $mods[ $name ] ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- unset($mods[$name]);
</del><ins>+ unset( $mods[ $name ] );
</ins><span class="cx">
</span><del>- if ( empty($mods) )
</del><ins>+ if ( empty( $mods ) )
</ins><span class="cx"> return remove_theme_mods();
</span><span class="cx">
</span><span class="cx"> $theme = get_option( 'stylesheet' );
</span></span></pre>
</div>
</div>
</body>
</html>