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

Timestamp:

09/21/2008 08:41:25 PM (17 years ago)

Author:

westi

Message:

Notice fixes see #7509 props DD32 and jacobsantos.

File:

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

trunk/wp-admin/includes/widgets.php

@@ -60 +60 @@
                 continue;
 
+            if ( ! isset( $widget['params'][0] ) )
+                $widget['params'][0] = array();
             ob_start();
-                $args = wp_list_widget_controls_dynamic_sidebar( array( 0 => array( 'widget_id' => $widget['id'], 'widget_name' => $widget['name'], '_display' => 'template', '_show' => $show ), 1 => $widget['params'][0] ) );
-                $sidebar_args = call_user_func_array( 'wp_widget_control', $args );
+            $args = wp_list_widget_controls_dynamic_sidebar( array( 0 => array( 'widget_id' => $widget['id'], 'widget_name' => $widget['name'], '_display' => 'template', '_show' => $show ), 1 => $widget['params'][0] ) );
+            $sidebar_args = call_user_func_array( 'wp_widget_control', $args );
             $widget_control_template = ob_get_contents();
             ob_end_clean();
@@ -231 +233 @@
 
     $id_format = $widget['id'];
+
+    if ( ! isset( $sidebar_args['_show'] ) )
+        $sidebar_args['_show'] = '';
+
+    if ( ! isset( $sidebar_args['_display'] ) )
+        $sidebar_args['_display'] = '';
+
     // We aren't showing a widget control, we're outputing a template for a mult-widget control
     if ( 'all' == $sidebar_args['_show'] && 'template' == $sidebar_args['_display'] && isset($control['params'][0]['number']) ) {