<!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>[19455] trunk: Check the sidebar class for orphaned sidebars, match sidebars by id while retrieving orphans and the theme has not changed, props SergeyBiryukov, fixes #19350</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/19455">19455</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-11-26 06:16:43 +0000 (Sat, 26 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Check the sidebar class for orphaned sidebars, match sidebars by id while retrieving orphans and the theme has not changed, props SergeyBiryukov, fixes <a href="http://core.trac.wordpress.org/ticket/19350">#19350</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminwidgetsphp">trunk/wp-admin/widgets.php</a></li>
<li><a href="#trunkwpincludeswidgetsphp">trunk/wp-includes/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (19454 => 19455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/widgets.php 2011-11-26 04:08:38 UTC (rev 19454)
+++ trunk/wp-admin/widgets.php 2011-11-26 06:16:43 UTC (rev 19455)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> if ( ! empty( $widgets ) ) { // register the inactive_widgets area as sidebar
</span><span class="cx"> register_sidebar(array(
</span><span class="cx"> 'name' => __( 'Inactive Sidebar (not used)' ),
</span><del>- 'id' => 'orphaned_widgets-' . $sidebar_id,
</del><ins>+ 'id' => $sidebar_id,
</ins><span class="cx"> 'class' => 'inactive-sidebar orphan-sidebar',
</span><span class="cx"> 'description' => __( 'This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar.' ),
</span><span class="cx"> 'before_widget' => '',
</span><span class="lines">@@ -344,7 +344,7 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
</span><del>- if ( 'wp_inactive_widgets' == $sidebar || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
</del><ins>+ if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
</ins><span class="cx"> $wrap_class = 'widgets-holder-wrap';
</span><span class="cx"> if ( !empty( $registered_sidebar['class'] ) )
</span><span class="cx"> $wrap_class .= ' ' . $registered_sidebar['class'];
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> $i = 0;
</span><span class="cx"> foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
</span><del>- if ( 'wp_inactive_widgets' == $sidebar || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) )
</del><ins>+ if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) )
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> $wrap_class = 'widgets-holder-wrap';
</span></span></pre></div>
<a id="trunkwpincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/widgets.php (19454 => 19455)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/widgets.php 2011-11-26 04:08:38 UTC (rev 19454)
+++ trunk/wp-includes/widgets.php 2011-11-26 06:16:43 UTC (rev 19455)
</span><span class="lines">@@ -1157,22 +1157,21 @@
</span><span class="cx"> if ( ! is_array( $sidebars_widgets ) )
</span><span class="cx"> $sidebars_widgets = wp_get_sidebars_widgets();
</span><span class="cx">
</span><del>- retrieve_widgets();
</del><ins>+ retrieve_widgets(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // look for "lost" widgets, this has to run at least on each theme change
</span><del>-function retrieve_widgets() {
</del><ins>+function retrieve_widgets($theme_changed = false) {
</ins><span class="cx"> global $wp_registered_widget_updates, $wp_registered_sidebars, $sidebars_widgets, $wp_registered_widgets;
</span><span class="cx">
</span><span class="cx"> $registered_sidebar_keys = array_keys( $wp_registered_sidebars );
</span><ins>+ $orphaned = 0;
</ins><span class="cx">
</span><span class="cx"> $old_sidebars_widgets = get_theme_mod( 'sidebars_widgets' );
</span><span class="cx"> if ( is_array( $old_sidebars_widgets ) ) {
</span><span class="cx"> // time() that sidebars were stored is in $old_sidebars_widgets['time']
</span><span class="cx"> $_sidebars_widgets = $old_sidebars_widgets['data'];
</span><span class="cx"> remove_theme_mod( 'sidebars_widgets' );
</span><del>-
- $orphaned = 0;
</del><span class="cx">
</span><span class="cx"> foreach ( $_sidebars_widgets as $sidebar => $widgets ) {
</span><span class="cx"> if ( 'wp_inactive_widgets' == $sidebar || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) )
</span><span class="lines">@@ -1202,11 +1201,18 @@
</span><span class="cx">
</span><span class="cx"> unset( $sidebars_widgets['wp_inactive_widgets'] );
</span><span class="cx">
</span><del>- foreach ( $wp_registered_sidebars as $id => $settings )
- $_sidebars_widgets[$id] = array_shift( $sidebars_widgets );
</del><ins>+ foreach ( $wp_registered_sidebars as $id => $settings ) {
+ if ( $theme_changed ) {
+ $_sidebars_widgets[$id] = array_shift( $sidebars_widgets );
+ } else {
+ // no theme change, grab only sidebars that are currently registered
+ if ( isset( $sidebars_widgets[$id] ) ) {
+ $_sidebars_widgets[$id] = $sidebars_widgets[$id];
+ unset( $sidebars_widgets[$id] );
+ }
+ }
+ }
</ins><span class="cx">
</span><del>- $orphaned = 0;
-
</del><span class="cx"> foreach ( $sidebars_widgets as $val ) {
</span><span class="cx"> if ( is_array($val) && ! empty( $val ) )
</span><span class="cx"> $_sidebars_widgets['orphaned_widgets_' . ++$orphaned] = $val;
</span></span></pre>
</div>
</div>
</body>
</html>