WordPress 4.0

[autoinstalls/wordpress.git] / wp-admin / includes / widgets.php

diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php
index c574f41f686679411772084e851f636e73c217fe..c869449434cd41093df394743f4e7dd94fe478db 100644 (file)
--- a/wp-admin/includes/widgets.php
+++ b/wp-admin/includes/widgets.php
@@ -12,7 +12,7 @@
  * @since 2.5.0
  */
 function wp_list_widgets() {
  * @since 2.5.0
  */
 function wp_list_widgets() {

-       global $wp_registered_widgets, $sidebars_widgets, $wp_registered_widget_controls;
+       global $wp_registered_widgets, $wp_registered_widget_controls;

 
        $sort = $wp_registered_widgets;
        usort( $sort, '_sort_name_callback' );
 
        $sort = $wp_registered_widgets;
        usort( $sort, '_sort_name_callback' );


@@ -173,11 +173,14 @@ function wp_widget_control( $sidebar_args ) {
                $query_arg['key'] = $key;
        }
 
                $query_arg['key'] = $key;
        }
 

-       // We aren't showing a widget control, we're outputting a template for a multi-widget control
+       /*
+        * We aren't showing a widget control, we're outputting a template
+        * for a multi-widget control.
+        */

        if ( isset($sidebar_args['_display']) && 'template' == $sidebar_args['_display'] && $widget_number ) {
                // number == -1 implies a template where id numbers are replaced by a generic '__i__'
                $control['params'][0]['number'] = -1;
        if ( isset($sidebar_args['_display']) && 'template' == $sidebar_args['_display'] && $widget_number ) {
                // number == -1 implies a template where id numbers are replaced by a generic '__i__'
                $control['params'][0]['number'] = -1;

-               // with id_base widget id's are constructed like {$id_base}-{$id_number}
+               // With id_base widget id's are constructed like {$id_base}-{$id_number}.

                if ( isset($control['id_base']) )
                        $id_format = $control['id_base'] . '-__i__';
        }
                if ( isset($control['id_base']) )
                        $id_format = $control['id_base'] . '-__i__';
        }


@@ -237,5 +240,6 @@ function wp_widget_control( $sidebar_args ) {
        </div>
 <?php
        echo $sidebar_args['after_widget'];
        </div>
 <?php
        echo $sidebar_args['after_widget'];

+

        return $sidebar_args;
 }
        return $sidebar_args;
 }