Ticket #5823: 5823.a.diff

wp-admin/includes/widgets.php

@@ -21 +21 @@
-                $no_widgets_shown = true;
-                $already_shown = array();
-                foreach ( $wp_registered_widgets as $name => $widget ) :
-
+'all' == $show && 
-                                continue;
-
-                        if ( $search_terms ) {
@@ -47 +47 @@
-                                continue;
-
-                        ob_start();
- )
+, '_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();
@@ -61 +61 @@
-                                        'key' => false,
-                                        'edit' => false
-                                );
-
+'all' == $show && 
-                                        // it's a multi-widget.  We only need to show it in the list once.
-                                        $already_shown[] = $widget['callback'];
-                                        $num = (int) array_pop( explode( '-', $widget['id'] ) );
@@ -92 +92 @@
-
-                        $no_widgets_shown = false;
-
+
+                        if ( 'all' != $show && $sidebar_args['_widget_title'] )
+                                $widget_title = $sidebar_args['_widget_title'];
+                        else
+                                $widget_title = $widget['name'];
-                ?>
-
-                <li id="widget-list-item-<?php echo attribute_escape( $widget['id'] ); ?>" class="widget-list-item">
-                        <h4 class="widget-title widget-draggable">
-
-wp_specialchars( $widget['name'] )
+$widget_title
-
-                                <?php if ( 'add' == $action ) : ?>
-
@@ -192 +197 @@
-
-        $id_format = $widget['id'];
-        // We aren't showing a widget control, we're outputing a template for a mult-widget control
-
+all' == $sidebar_args['_show'] && '
-                // number == -1 implies a template where id numbers are replaced by a generic '%i%'
-                $control['params'][0]['number'] = -1;
-                // if given, id_base means widget id's should be constructed like {$id_base}-{$id_number}
@@ -202 +207 @@
-
-        $widget_title = '';
-        // We grab the normal widget output to find the widget's title
-
+( 'all' != $sidebar_args['_show'] || 'template' != $sidebar_args['_display'] ) && 
-                ob_start();
-                $args = func_get_args();
-                call_user_func_array( $widget['_callback'], $args );
@@ -212 +217 @@
-        $wp_registered_widgets[$widget_id]['callback'] = $wp_registered_widgets[$widget_id]['_callback'];
-        unset($wp_registered_widgets[$widget_id]['_callback']);
-
-control['
+sidebar_args['widget_
-                $widget_title = sprintf( _c('%1$s: %2$s|1: widget name, 2: widget title' ), $sidebar_args['widget_name'], $widget_title );
-        else
-                $widget_title = wp_specialchars( strip_tags( $sidebar_args['widget_name'] ) );
-
+        $sidebar_args['_widget_title'] = $widget_title;
+
-        if ( empty($sidebar_args['_display']) || 'template' != $sidebar_args['_display'] )
-                echo $sidebar_args['before_widget'];
-?>
@@ -270 +277 @@
-        if ( false === $end = strpos( $string, '%END_OF_TITLE%' ) )
-                return '';
-        $string = substr( $string, $beg + 14 , $end - $beg - 14);
-
+
+
-}
-
-function widget_css() {