WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match old/new sidebars by index when switching themes, see #9511 

git-svn-id: http://svn.automattic.com/wordpress/trunk@10927 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-04-14 01:17:57 +00:00
parent 0a0dde8ddc
commit 47d717faaf
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
wp-admin/widgets.php
View File

@ -38,21 +38,43 @@ $sidebars_widgets = wp_get_sidebars_widgets();
if ( empty( $sidebars_widgets ) ) if ( empty( $sidebars_widgets ) )
$sidebars_widgets = wp_get_widget_defaults(); $sidebars_widgets = wp_get_widget_defaults();
// look for "lost" widgets, perhaps run only after changin themes // look for "lost" widgets, this has to run at each theme change
function retrieve_widgets() { function retrieve_widgets() {
global $wp_registered_widget_updates, $wp_registered_sidebars, $sidebars_widgets; global $wp_registered_widget_updates, $wp_registered_sidebars, $sidebars_widgets;
$key_sidebars = array_keys( (array) $wp_registered_sidebars); $_sidebars_widgets = array();
$key_widgets = array_keys($sidebars_widgets); $sidebars = array_keys($wp_registered_sidebars);
if ( count($key_widgets) > count($key_sidebars) ) {
$changed_sidebars = array_diff( $key_widgets, $key_sidebars ); $diff = array_diff( array_keys($sidebars_widgets), $sidebars );
foreach ( $changed_sidebars as $lost ) { if ( empty($diff) )
if ( is_array($sidebars_widgets[$lost]) ) return;
$sidebars_widgets['wp_inactive_widgets'] = array_merge( (array) $sidebars_widgets['wp_inactive_widgets'], $sidebars_widgets[$lost] );
unset($sidebars_widgets[$lost]); unset( $sidebars_widgets['array_version'] );
// Move the known-good ones first
foreach ( $sidebars as $id ) {
if ( array_key_exists( $id, $sidebars_widgets ) ) {
$_sidebars_widgets[$id] = $sidebars_widgets[$id];
unset($sidebars_widgets[$id], $sidebars[$id]);
} }
} }
// Assign to each unmatched registered sidebar the first available orphan
while ( ( $sidebar = array_shift( $sidebars ) ) && $widgets = array_shift( $sidebars_widgets ) )
$_sidebars_widgets[ $sidebar ] = $widgets;
// if new theme has less sidebars than the old theme
if ( !empty($sidebars_widgets) ) {
foreach ( $sidebars_widgets as $lost => $val ) {
if ( is_array($val) )
$_sidebars_widgets['wp_inactive_widgets'] = array_merge( (array) $_sidebars_widgets['wp_inactive_widgets'], $val );
}
}
$sidebars_widgets = $_sidebars_widgets;
unset($_sidebars_widgets);
// find hidden/lost multi-widget instances
$shown_widgets = array(); $shown_widgets = array();
foreach ( $sidebars_widgets as $sidebar ) { foreach ( $sidebars_widgets as $sidebar ) {
if ( is_array($sidebar) ) if ( is_array($sidebar) )
@ -83,6 +105,7 @@ function retrieve_widgets() {
} }
$sidebars_widgets['wp_inactive_widgets'] = array_merge($lost_widgets, (array) $sidebars_widgets['wp_inactive_widgets']); $sidebars_widgets['wp_inactive_widgets'] = array_merge($lost_widgets, (array) $sidebars_widgets['wp_inactive_widgets']);
$sidebars_widgets['array_version'] = 3;
wp_set_sidebars_widgets($sidebars_widgets); wp_set_sidebars_widgets($sidebars_widgets);
} }
retrieve_widgets(); retrieve_widgets();
@ -134,7 +157,6 @@ require_once( 'admin-header.php' ); ?>
<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div> <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
<?php endif; ?> <?php endif; ?>
<!-- <!--
<form id="widgets-filter" action="" method="get"> <form id="widgets-filter" action="" method="get">