Changeset 35102 for trunk/src/wp-includes/class-wp-customize-widgets.php

Timestamp:

10/13/2015 01:32:27 AM (9 years ago)

Author:

wonderboymusic

Message:

Widgets: add a function, is_registered_sidebar() - helps us avoid touching the $wp_registered_sidebars global.

Props GaryJ, wonderboymusic.
Fixes #24878.

File:

• trunk/src/wp-includes/class-wp-customize-widgets.php (modified) (5 diffs)

trunk/src/wp-includes/class-wp-customize-widgets.php

@@ -366 +366 @@
             }
 
-            $is_registered_sidebar = isset( $wp_registered_sidebars[ $sidebar_id ] );
+            $is_registered_sidebar = is_registered_sidebar( $sidebar_id );
             $is_inactive_widgets   = ( 'wp_inactive_widgets' === $sidebar_id );
             $is_active_sidebar     = ( $is_registered_sidebar && ! $is_inactive_widgets );
@@ -1103 +1103 @@
      * @access public
      *
-     * @global array $wp_registered_sidebars
-     *
      * @param bool   $is_active  Whether the sidebar is active.
      * @param string $sidebar_id Sidebar ID.
@@ -1110 +1108 @@
      */
     public function tally_sidebars_via_is_active_sidebar_calls( $is_active, $sidebar_id ) {
-        if ( isset( $GLOBALS['wp_registered_sidebars'][$sidebar_id] ) ) {
+        if ( is_registered_sidebar( $sidebar_id ) ) {
             $this->rendered_sidebars[] = $sidebar_id;
         }
@@ -1131 +1129 @@
      * @access public
      *
-     * @global array $wp_registered_sidebars
-     *
      * @param bool   $has_widgets Whether the current sidebar has widgets.
      * @param string $sidebar_id  Sidebar ID.
@@ -1138 +1134 @@
      */
     public function tally_sidebars_via_dynamic_sidebar_calls( $has_widgets, $sidebar_id ) {
-        if ( isset( $GLOBALS['wp_registered_sidebars'][$sidebar_id] ) ) {
+        if ( is_registered_sidebar( $sidebar_id ) ) {
             $this->rendered_sidebars[] = $sidebar_id;
         }