Changeset 6717

Timestamp:

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

Author:

ryan

Message:

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

Location:

trunk

Files:

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

trunk/wp-admin/includes/dashboard.php

@@ -109 +109 @@
     $dashboard_widgets = apply_filters( 'wp_dashboard_widgets', $dashboard_widgets );
 
-    $wp_dashboard_sidebars = array( 'wp_dashboard' => $dashboard_widgets );
+    $wp_dashboard_sidebars = array( 'wp_dashboard' => $dashboard_widgets, 'array_version' => 3.5 );
 
     add_filter( 'dynamic_sidebar_params', 'wp_dashboard_dynamic_sidebar_params' );

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>';
             }
 

trunk/wp-admin/widgets.php

@@ -53 +53 @@
     /* Hack #1
      * The widget_control is overloaded.  It updates the widget's options AND echoes out the widget's HTML form.
-     * Since we want to update before sending out any headers, we have to catchi it with an output buffer
+     * Since we want to update before sending out any headers, we have to catch it with an output buffer,
      */
     ob_start();
         /* There can be multiple widgets of the same type, but the widget_control for that
-         * widget type needs only be called once.
+         * widget type needs only be called once if it's a multi-widget.
          */
         $already_done = array();
@@ -65 +65 @@
                 continue;
 
-            if ( is_callable( $control['callback'] ) )
+            if ( is_callable( $control['callback'] ) ) {
                 call_user_func_array( $control['callback'], $control['params'] );
+                $control_output = ob_get_contents();
+                if ( false !== strpos( $control_output, '%i%' ) ) // if it's a multi-widget, only call control function once.
+                    $already_done[] = $control['callback'];
+            }
+
+            ob_clean();
         }
     ob_end_clean();
@@ -76 +82 @@
 
     // Reset the key numbering and stare
-    $new_sidebar = array_values( $_POST['widget-id'] );
+    $new_sidebar = isset( $_POST['widget-id'] ) && is_array( $_POST['widget-id'] ) ? array_values( $_POST['widget-id'] ) : array();
     $sidebars_widgets[$_POST['sidebar']] = $new_sidebar;
     wp_set_sidebars_widgets( $sidebars_widgets );

trunk/wp-includes/widgets.php

@@ -160 +160 @@
  *   height: never used
  *   width:  width of fully expanded control form.  Try hard to use the default width.
- *   id_base: for widgets which allow multiple instances (such as the text widget), an id_base must be provided.
+ *   id_base: for multi-widgets (widgets which allow multiple instances such as the text widget), an id_base must be provided.
  *            the widget id will ennd up looking like {$id_base}-{$unique_number}
  */
@@ -1390 +1390 @@
 add_action('init', 'wp_widgets_init', 1);
 
-/* Pattern for widget which allows multiple instances (such as the text widget)
+/* Pattern for multi-widget (allows multiple instances such as the text widget).
 
 // Displays widget on blag