Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove temporary 3.8 hooks from the 3.7 branch. 

props nofearinc.
fixes #25656.

Built from https://develop.svn.wordpress.org/branches/3.7@25878


git-svn-id: http://core.svn.wordpress.org/branches/3.7@25790 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-10-22 23:58:10 +00:00
parent bd01235e18
commit a9d0b1c785
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-includes/widgets.php
View File

@ -859,16 +859,9 @@ function dynamic_sidebar($index = 1) {
$sidebars_widgets = wp_get_sidebars_widgets();
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 );
return false;
}
//temporary_hook #25368
do_action( 'temp_dynamic_sidebar_before', $index, true );
$sidebar = $wp_registered_sidebars[$index];
$did_one = false;
@ -904,10 +897,6 @@ function dynamic_sidebar($index = 1) {
}
}
//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;
}
@ -987,8 +976,6 @@ function is_active_sidebar( $index ) {
$index = ( is_int($index) ) ? "sidebar-$index" : sanitize_title($index);
$sidebars_widgets = wp_get_sidebars_widgets();
$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;
}