Changeset 7080

Timestamp:

02/28/2008 12:31:46 AM (18 years ago)

Author:

ryan

Message:

Fix widgets using old-style multi instance support. Props mdawaffe. fixes #6023

Location:

trunk

Files:

• wp-admin/includes/widgets.php (modified) (2 diffs)
• wp-includes/widgets.php (modified) (2 diffs)

trunk/wp-admin/includes/widgets.php

@@ -42 +42 @@
             }
 
-            $sidebar = is_active_widget( $widget['callback'] );
+            $sidebar = is_active_widget( $widget['callback'], $widget['id'] );
+
             if ( ( 'unused' == $show && $sidebar ) || ( 'used' == $show && !$sidebar ) )
                 continue;
@@ -51 +52 @@
             ob_end_clean();
 
-            if ( !$sidebar || false !== strpos( $widget_control_template, '%i%' ) ) {
-                $already_shown[] = $widget['callback']; // it's a multi-widget.  We only need to show it in the list once.
+            if ( !$sidebar || $is_multi = false !== strpos( $widget_control_template, '%i%' ) ) {
+                if ( $is_multi )
+                    $already_shown[] = $widget['callback']; // it's a multi-widget.  We only need to show it in the list once.
                 $action = 'add';
                 $add_url = wp_nonce_url( add_query_arg( array(

trunk/wp-includes/widgets.php

@@ -253 +253 @@
 /* @return mixed false if widget is not active or id of sidebar in which the widget is active
  */
-function is_active_widget($callback) {
+function is_active_widget($callback, $widget_id = false) {
     global $wp_registered_widgets;
 
@@ -261 +261 @@
         if ( is_array($widgets) ) foreach ( $widgets as $widget )
             if ( isset($wp_registered_widgets[$widget]['callback']) && $wp_registered_widgets[$widget]['callback'] == $callback )
-                return $sidebar;
+                if ( !$widget_id || $widget_id == $wp_registered_widgets[$widget]['id'] )
+                    return $sidebar;
+                
 
     return false;