Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-09 01:48:21 +01:00
Code Issues Projects Releases Wiki Activity

Widget registration fixes from Andy. For 2.3. see #4169

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@5358 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-04-30 20:02:02 +00:00
parent 8efa935340
commit 72a19935ff
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
wp-includes/widgets.php
View File

@ -43,7 +43,8 @@ function register_sidebar($args = array()) {
$i = count($wp_registered_sidebars) + 1; $i = count($wp_registered_sidebars) + 1;
$defaults = array( $defaults = array(
'name' => sprintf(__('Sidebar %d'), count($wp_registered_sidebars) + 1 ), 'name' => sprintf(__('Sidebar %d'), $i ),
'id' => "sidebar-$i",
'before_widget' => '<li id="%1$s" class="widget %2$s">', 'before_widget' => '<li id="%1$s" class="widget %2$s">',
'after_widget' => "</li>\n", 'after_widget' => "</li>\n",
'before_title' => '<h2 class="widgettitle">', 'before_title' => '<h2 class="widgettitle">',
@ -52,7 +53,6 @@ function register_sidebar($args = array()) {
$sidebar = array_merge($defaults, $args); $sidebar = array_merge($defaults, $args);
if ( ! isset($sidebar['id']) ) $sidebar['id'] = sanitize_title($sidebar['name']);
$wp_registered_sidebars[$sidebar['id']] = $sidebar; $wp_registered_sidebars[$sidebar['id']] = $sidebar;
return $sidebar['id']; return $sidebar['id'];
@ -220,7 +220,7 @@ endif;
/* Internal Functions */ /* Internal Functions */
function wp_get_sidebars_widgets($update = true) { function wp_get_sidebars_widgets($update = true) {
global $wp_registered_widgets; global $wp_registered_widgets, $wp_registered_sidebars;
$sidebars_widgets = get_option('sidebars_widgets'); $sidebars_widgets = get_option('sidebars_widgets');
$_sidebars_widgets = array(); $_sidebars_widgets = array();
@ -246,17 +246,37 @@ function wp_get_sidebars_widgets($update = true) {
unset($_sidebars_widgets[$index][$i]); unset($_sidebars_widgets[$index][$i]);
} }
$_sidebars_widgets['array_version'] = 2; $_sidebars_widgets['array_version'] = 2;
if ( $update ) $sidebars_widgets = $_sidebars_widgets;
update_option('sidebars_widgets', $_sidebars_widgets); unset($_sidebars_widgets);
break;
case 2 : case 2 :
$_sidebars_widgets = $sidebars_widgets; $sidebars = array_keys( $wp_registered_sidebars );
break; if ( !empty( $sidebars ) ) {
// 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
unset( $sidebars_widgets[ 'array_version' ] );
while ( ( $sidebar = array_shift( $sidebars ) ) && $widgets = array_shift( $sidebars_widgets ) )
$_sidebars_widgets[ $sidebar ] = $widgets;
$_sidebars_widgets['array_version'] = 3;
$sidebars_widgets = $_sidebars_widgets;
unset($_sidebars_widgets);
}
if ( $update )
update_option('sidebars_widgets', $sidebars_widgets);
} }
unset($_sidebars_widgets['array_version']); unset($sidebars_widgets['array_version']);
return $_sidebars_widgets; return $sidebars_widgets;
} }
function wp_set_sidebars_widgets( $sidebars_widgets ) { function wp_set_sidebars_widgets( $sidebars_widgets ) {
@ -543,7 +563,7 @@ function wp_widget_categories($args) {
<script lang='javascript'><!-- <script lang='javascript'><!--
var dropdown = document.getElementById("cat"); var dropdown = document.getElementById("cat");
function onCatChange() { function onCatChange() {
location.href = "?cat="+dropdown.options[dropdown.selectedIndex].value; location.href = "<?php echo get_option('siteurl'); ?>/?cat="+dropdown.options[dropdown.selectedIndex].value;
} }
dropdown.onchange = onCatChange; dropdown.onchange = onCatChange;
--></script> --></script>