Changes in trunk/wp-admin/includes/widgets.php [11577:12284]

File:

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

trunk/wp-admin/includes/widgets.php

@@ -53 +53 @@
 
 /**
- * {@internal Missing Short Description}}
- *
- * @since unknown
- *
- * @param string $sidebar
+ * Show the widgets and their settings for a sidebar.
+ * Used in the the admin widget config screen.
+ *
+ * @since unknown
+ *
+ * @param string $sidebar id slug of the sidebar
  */
 function wp_list_widget_controls( $sidebar ) {
     add_filter( 'dynamic_sidebar_params', 'wp_list_widget_controls_dynamic_sidebar' );
 
-    echo "\t<div id='$sidebar' class='widgets-sortables'>\n";
+    echo "<div id='$sidebar' class='widgets-sortables'>\n";
+
+    $description = wp_sidebar_description( $sidebar );
+
+    if ( !empty( $description ) ) {
+        echo "<div class='sidebar-description'>\n";
+        echo "\t<p class='description'>$description</p>"; 
+        echo "</div>\n";
+    }
+
     dynamic_sidebar( $sidebar );
-    echo "\t</div>\n";
+    echo "</div>\n";
 }
 
@@ -181 +191 @@
     <input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($id_format); ?>" />
     <input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
-    <input type="hidden" name="widget-width" class="widget-width" value="<?php echo esc_attr($control['width']); ?>" />
-    <input type="hidden" name="widget-height" class="widget-height" value="<?php echo esc_attr($control['height']); ?>" />
+    <input type="hidden" name="widget-width" class="widget-width" value="<?php if (isset( $control['width'] )) echo esc_attr($control['width']); ?>" />
+    <input type="hidden" name="widget-height" class="widget-height" value="<?php if (isset( $control['height'] )) echo esc_attr($control['height']); ?>" />
     <input type="hidden" name="widget_number" class="widget_number" value="<?php echo esc_attr($widget_number); ?>" />
     <input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />