Changeset 6717 for trunk/wp-admin/includes/widgets.php

Timestamp:

02/04/2008 08:38:48 PM (17 years ago)

Author:

ryan

Message:

Dashboard fixes from mdawaffe. No longer stomps sidebar. see #5750

File:

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

trunk/wp-admin/includes/widgets.php

@@ -22 +22 @@
         $already_shown = array();
         foreach ( $wp_registered_widgets as $name => $widget ) :
-            if ( in_array( $widget['callback'], $already_shown ) )
+            if ( in_array( $widget['callback'], $already_shown ) ) // We already showed this multi-widget
                 continue;
-            $already_shown[] = $widget['callback'];
 
             if ( $search_terms ) {
@@ -53 +52 @@
 
             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.
                 $action = 'add'; 
                 $add_url = wp_nonce_url( add_query_arg( array(
@@ -67 +67 @@
                     'key' => array_search( $widget['id'], $sidebars_widgets[$sidebar] ),
                 ) );
-                $widget_control_template = "<textarea>$widget_control_template</textarea>";
+                $widget_control_template = '<textarea>' . htmlspecialchars( $widget_control_template ) . '</textarea>';
             }