Changeset 11164

Timestamp:

05/03/2009 11:20:26 PM (17 years ago)

Author:

azaozz

Message:

Make is_active_widget() optionally look in 'wp_inactive_widgets' for use in the admin

Location:

trunk

Files:

• wp-admin/includes/widgets.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-includes/widgets.php (modified) (2 diffs)

trunk/wp-admin/includes/widgets.php

@@ -32 +32 @@
             continue;
 
-        $sidebar = is_active_widget( $widget['callback'], $widget['id'] );
+        $sidebar = is_active_widget( $widget['callback'], $widget['id'], false, false );
         $done[] = $widget['callback'];
 

trunk/wp-includes/script-loader.php

@@ -331 +331 @@
         $scripts->add_data( 'media-upload', 'group', 1 );
 
-        $scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable' ), '20090502' );
+        $scripts->add( 'admin-widgets', "/wp-admin/js/widgets$suffix.js", array( 'jquery-ui-sortable', 'jquery-ui-draggable' ), '20090503' );
         $scripts->add_data( 'admin-widgets', 'group', 1 );
 

trunk/wp-includes/widgets.php

@@ -817 +817 @@
  * @param int $widget_id Optional, but needed for checking. Widget ID.
  * @param string $id_base Optional, the base ID of a widget created by extending WP_Widget.
+ * @param bool $skip_inactive Optional, whether to check in 'wp_inactive_widgets'.
  * @return mixed false if widget is not active or id of sidebar in which the widget is active.
  */
-function is_active_widget($callback = false, $widget_id = false, $id_base = false) {
+function is_active_widget($callback = false, $widget_id = false, $id_base = false, $skip_inactive = true) {
     global $wp_registered_widgets;
 
@@ -826 +827 @@
     if ( is_array($sidebars_widgets) ) {
         foreach ( $sidebars_widgets as $sidebar => $widgets ) {
+            if ( $skip_inactive && 'wp_inactive_widgets' == $sidebar )
+                continue;
+            
             if ( is_array($widgets) ) {
                 foreach ( $widgets as $widget ) {