Changeset 25580

Timestamp:

09/23/2013 08:13:58 PM (11 years ago)

Author:

nacin

Message:

Temporary hooks for the widgets feature team in dynamic_sidebar() and is_active_sidebar().

props westonruter.
fixes #25368.

File:

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

trunk/src/wp-includes/widgets.php

@@ -859 +859 @@
 
     $sidebars_widgets = wp_get_sidebars_widgets();
-    if ( empty( $sidebars_widgets ) )
-        return false;
-
-    if ( empty($wp_registered_sidebars[$index]) || !array_key_exists($index, $sidebars_widgets) || !is_array($sidebars_widgets[$index]) || empty($sidebars_widgets[$index]) )
-        return false;
-
+    if ( empty( $wp_registered_sidebars[ $index ] ) || empty( $sidebars_widgets[ $index ] ) || ! is_array( $sidebars_widgets[ $index ] ) ) {
+        //temporary_hook #25368
+        do_action( 'temp_dynamic_sidebar_before', $index, false );
+        //temporary_hook #25368
+        do_action( 'temp_dynamic_sidebar_after',  $index, false );
+        //temporary_hook #25368
+        return apply_filters( 'temp_dynamic_sidebar_has_widgets', false, $index );
+    }
+
+    //temporary_hook #25368
+    do_action( 'temp_dynamic_sidebar_before', $index, true );
     $sidebar = $wp_registered_sidebars[$index];
 
@@ -900 +905 @@
     }
 
+    //temporary_hook #25368
+    do_action( 'temp_dynamic_sidebar_after', $index, true );
+    //temporary_hook #25368
+    $did_one = apply_filters( 'temp_dynamic_sidebar_has_widgets', $did_one, $index );
     return $did_one;
 }
@@ -978 +987 @@
     $index = ( is_int($index) ) ? "sidebar-$index" : sanitize_title($index);
     $sidebars_widgets = wp_get_sidebars_widgets();
-    if ( !empty($sidebars_widgets[$index]) )
-        return true;
-
-    return false;
+    $is_active_sidebar = ! empty( $sidebars_widgets[$index] );
+    //temporary_hook #25368
+    $is_active_sidebar = apply_filters( 'temp_is_active_sidebar', $is_active_sidebar, $index );
+    return $is_active_sidebar;
 }