Changeset 25878 for branches/3.7/src

Timestamp:

10/22/2013 11:57:22 PM (13 years ago)

Author:

nacin

Message:

Remove temporary 3.8 hooks from the 3.7 branch.

props nofearinc.
fixes #25656.

File:

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

branches/3.7/src/wp-includes/widgets.php

@@ -860 +860 @@
         $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 );
-        }
-
-        //temporary_hook #25368
-        do_action( 'temp_dynamic_sidebar_before', $index, true );
+                return false;
+        }
+
         $sidebar = $wp_registered_sidebars[$index];
 
@@ -905 +898 @@
         }
 
-        //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;
 }
@@ -988 +977 @@
         $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;
 }