<!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" />
<title>[21643] trunk/wp-content/themes/twentytwelve: Twenty Twelve: use sidebar ID string value for sidebar checks instead of hard-coded integer, props nacin.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21643">21643</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2012-08-28 17:16:18 +0000 (Tue, 28 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Twelve: use sidebar ID string value for sidebar checks instead of hard-coded integer, props nacin. See <a href="http://core.trac.wordpress.org/ticket/21685">#21685</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytwelvefunctionsphp">trunk/wp-content/themes/twentytwelve/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvesidebarhomephp">trunk/wp-content/themes/twentytwelve/sidebar-home.php</a></li>
<li><a href="#trunkwpcontentthemestwentytwelvesidebarphp">trunk/wp-content/themes/twentytwelve/sidebar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytwelvefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/functions.php (21642 => 21643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/functions.php 2012-08-28 17:12:10 UTC (rev 21642)
+++ trunk/wp-content/themes/twentytwelve/functions.php 2012-08-28 17:16:18 UTC (rev 21643)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> function twentytwelve_homepage_sidebar_class() {
</span><span class="cx"> $classes = array( 'widget-area' );
</span><span class="cx">
</span><del>- if ( is_active_sidebar( 2 ) && is_active_sidebar( 3 ) )
</del><ins>+ if ( is_active_sidebar( 'sidebar-2' ) && is_active_sidebar( 'sidebar-3' ) )
</ins><span class="cx"> $classes[] = 'two';
</span><span class="cx">
</span><span class="cx"> echo 'class="' . implode( ' ', $classes ) . '"';
</span><span class="lines">@@ -362,7 +362,7 @@
</span><span class="cx"> function twentytwelve_body_class( $classes ) {
</span><span class="cx"> $background_color = get_background_color();
</span><span class="cx">
</span><del>- if ( ! is_active_sidebar( 1 ) || is_page_template( 'page-templates/full-width.php' ) )
</del><ins>+ if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'page-templates/full-width.php' ) )
</ins><span class="cx"> $classes[] = 'full-width';
</span><span class="cx">
</span><span class="cx"> if ( is_page_template( 'page-templates/home.php' ) ) {
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> * @since Twenty Twelve 1.0
</span><span class="cx"> */
</span><span class="cx"> function twentytwelve_content_width() {
</span><del>- if ( is_page_template( 'page-templates/full-width.php' ) || is_attachment() || ! is_active_sidebar( 1 ) ) {
</del><ins>+ if ( is_page_template( 'page-templates/full-width.php' ) || is_attachment() || ! is_active_sidebar( 'sidebar-1' ) ) {
</ins><span class="cx"> global $content_width;
</span><span class="cx"> $content_width = 960;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvesidebarhomephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/sidebar-home.php (21642 => 21643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/sidebar-home.php 2012-08-28 17:12:10 UTC (rev 21642)
+++ trunk/wp-content/themes/twentytwelve/sidebar-home.php 2012-08-28 17:16:18 UTC (rev 21643)
</span><span class="lines">@@ -15,21 +15,21 @@
</span><span class="cx"> *
</span><span class="cx"> * If none of the sidebars have widgets, then let's bail early.
</span><span class="cx"> */
</span><del>-if ( ! is_active_sidebar( 2 ) && ! is_active_sidebar( 3 ) )
</del><ins>+if ( ! is_active_sidebar( 'sidebar-2' ) && ! is_active_sidebar( 'sidebar-3' ) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // If we get this far, we have widgets. Let do this.
</span><span class="cx"> ?>
</span><span class="cx"> <div id="secondary" <?php twentytwelve_homepage_sidebar_class(); ?> role="complementary">
</span><del>- <?php if ( is_active_sidebar( 2 ) ) : ?>
</del><ins>+ <?php if ( is_active_sidebar( 'sidebar-2' ) ) : ?>
</ins><span class="cx"> <div class="first home-widgets">
</span><del>- <?php dynamic_sidebar( 2 ); ?>
</del><ins>+ <?php dynamic_sidebar( 'sidebar-2' ); ?>
</ins><span class="cx"> </div><!-- .first -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php if ( is_active_sidebar( 3 ) ) : ?>
</del><ins>+ <?php if ( is_active_sidebar( 'sidebar-3' ) ) : ?>
</ins><span class="cx"> <div class="second home-widgets">
</span><del>- <?php dynamic_sidebar( 3 ); ?>
</del><ins>+ <?php dynamic_sidebar( 'sidebar-3' ); ?>
</ins><span class="cx"> </div><!-- .second -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div><!-- #secondary -->
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytwelvesidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentytwelve/sidebar.php (21642 => 21643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentytwelve/sidebar.php 2012-08-28 17:12:10 UTC (rev 21642)
+++ trunk/wp-content/themes/twentytwelve/sidebar.php 2012-08-28 17:16:18 UTC (rev 21643)
</span><span class="lines">@@ -10,8 +10,8 @@
</span><span class="cx"> */
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>- <?php if ( is_active_sidebar( 1 ) ) : ?>
</del><ins>+ <?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
</ins><span class="cx"> <div id="secondary" class="widget-area" role="complementary">
</span><del>- <?php dynamic_sidebar( 1 ); ?>
</del><ins>+ <?php dynamic_sidebar( 'sidebar-1' ); ?>
</ins><span class="cx"> </div><!-- #secondary -->
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>