Make WordPress Core

Changeset 26855


Ignore:
Timestamp:
12/11/2013 11:06:02 PM (10 years ago)
Author:
nacin
Message:

Remove temporary hooks from the 3.8 branch.

fixes #25656 for 3.8.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.8/src/wp-includes/widgets.php

    r25580 r26855  
    860860    $sidebars_widgets = wp_get_sidebars_widgets();
    861861    if ( empty( $wp_registered_sidebars[ $index ] ) || empty( $sidebars_widgets[ $index ] ) || ! is_array( $sidebars_widgets[ $index ] ) ) {
    862         //temporary_hook #25368
    863         do_action( 'temp_dynamic_sidebar_before', $index, false );
    864         //temporary_hook #25368
    865         do_action( 'temp_dynamic_sidebar_after',  $index, false );
    866         //temporary_hook #25368
    867         return apply_filters( 'temp_dynamic_sidebar_has_widgets', false, $index );
    868     }
    869 
    870     //temporary_hook #25368
    871     do_action( 'temp_dynamic_sidebar_before', $index, true );
     862        return false;
     863    }
     864
    872865    $sidebar = $wp_registered_sidebars[$index];
    873866
     
    905898    }
    906899
    907     //temporary_hook #25368
    908     do_action( 'temp_dynamic_sidebar_after', $index, true );
    909     //temporary_hook #25368
    910     $did_one = apply_filters( 'temp_dynamic_sidebar_has_widgets', $did_one, $index );
    911900    return $did_one;
    912901}
     
    988977    $sidebars_widgets = wp_get_sidebars_widgets();
    989978    $is_active_sidebar = ! empty( $sidebars_widgets[$index] );
    990     //temporary_hook #25368
    991     $is_active_sidebar = apply_filters( 'temp_is_active_sidebar', $is_active_sidebar, $index );
    992979    return $is_active_sidebar;
    993980}
Note: See TracChangeset for help on using the changeset viewer.