Changes in trunk/wp-includes/widgets.php [11824:12249]

File:

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

trunk/wp-includes/widgets.php

@@ -127 +127 @@
     function _register() {
         $settings = $this->get_settings();
-
-        if ( empty($settings) ) {
+        $empty = true;
+
+        if ( is_array($settings) ) {
+            foreach ( array_keys($settings) as $number ) {
+                if ( is_numeric($number) ) {
+                    $this->_set($number);
+                    $this->_register_one($number);
+                    $empty = false;
+                }
+            }
+        }
+
+        if ( $empty ) {
             // If there are none, we register the widget's existance with a
             // generic template
             $this->_set(1);
             $this->_register_one();
-        } elseif ( is_array($settings) ) {
-            foreach ( array_keys($settings) as $number ) {
-                if ( is_numeric($number) ) {
-                    $this->_set($number);
-                    $this->_register_one($number);
-                }
-            }
         }
     }
@@ -545 +549 @@
         'name' => sprintf(__('Sidebar %d'), $i ),
         'id' => "sidebar-$i",
+        'description' => '',
         'before_widget' => '<li id="%1$s" class="widget %2$s">',
         'after_widget' => "</li>\n",
@@ -650 +655 @@
         return esc_html( $wp_registered_widgets[$id]['description'] );
 }
+
+/**
+ * Retrieve description for a sidebar.
+ *
+ * When registering sidebars a 'description' parameter can be included that
+ * describes the sidebar for display on the widget administration panel.
+ *
+ * @since 2.9.0
+ *
+ * @param int|string $id sidebar ID.
+ * @return string Sidebar description, if available. Null on failure to retrieve description.
+ */
+function wp_sidebar_description( $id ) {
+    if ( !is_scalar($id) )
+        return;
+
+    global $wp_registered_sidebars;
+
+    if ( isset($wp_registered_sidebars[$id]['description']) )
+        return esc_html( $wp_registered_sidebars[$id]['description'] );
+}
+
 
 /**