WordPress.org

Make WordPress Core

Ticket #36819: 36819.5.diff

File 36819.5.diff, 4.9 KB (added by jorbin, 4 years ago)
  • tests/phpunit/tests/actions.php

     
    332332         * @ticket 36819
    333333         */
    334334        function test_backup_plugin_globals_returns_filters() {
    335                 $backup = _backup_plugin_globals();
     335                $backup = _backup_plugin_globals( true );
    336336                $this->assertArrayHasKey( 'backup_wp_filter',         $backup );
    337337                $this->assertArrayHasKey( 'backup_wp_actions',        $backup );
    338338                $this->assertArrayHasKey( 'backup_wp_current_filter', $backup );
     
    343343         * @ticket 36819
    344344         */
    345345        function test_backup_plugin_globals_returns_filters_from_first_time_called() {
    346                 $backup = _backup_plugin_globals();
     346                $backup = _backup_plugin_globals( true );
    347347
    348348                $a = new MockAction();
    349349                $tag = rand_str();
    350350
    351351                add_action($tag, array(&$a, 'action'));
    352352
    353                 $new_backup = _backup_plugin_globals();
     353                $new_backup = _backup_plugin_globals( false );
    354354                $this->assertEquals( $backup, $new_backup );
    355355        }
    356356
     
    361361                global $wp_actions;
    362362                $original_actions = $wp_actions;
    363363
    364                 _backup_plugin_globals();
     364                _backup_plugin_globals( true );
    365365
    366366                $wp_actions = array();
    367367
     
    378378                global $wp_filter;
    379379                $original_filter = $wp_filter;
    380380
    381                 $backup = _backup_plugin_globals();
     381                $backup = _backup_plugin_globals( true );
    382382
    383383                $a = new MockAction();
    384384                $tag = rand_str();
  • src/wp-settings.php

     
    8383 */
    8484if ( WP_CACHE && apply_filters( 'enable_loading_advanced_cache_dropin', true ) ) {
    8585// For an advanced caching plugin to use. Uses a static drop-in because you would only want one.
    86         _backup_plugin_globals();
     86        _backup_plugin_globals( true );
    8787        WP_DEBUG ? include( WP_CONTENT_DIR . '/advanced-cache.php' ) : @include( WP_CONTENT_DIR . '/advanced-cache.php' );
    8888        _restore_plugin_globals();
    8989}
  • src/wp-includes/plugin.php

     
    10191019 *
    10201020 * @return array the staticvar from the first time it is set.
    10211021 */
    1022 function _backup_plugin_globals(){
     1022function _backup_plugin_globals( $backup = true ) {
    10231023        global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
    10241024
    10251025        static $backup_globals = array();
    10261026
    1027         if ( empty( $backup_globals ) ) {
     1027        if ( $backup ) {
    10281028                $backup_globals = array(
    10291029                        'backup_wp_filter'         => $wp_filter,
    10301030                        'backup_wp_actions'        => $wp_actions,
    10311031                        'backup_merged_filters'    => $merged_filters,
    10321032                        'backup_wp_current_filter' => $wp_current_filter,
    10331033                );
    1034         };
     1034
     1035                $wp_filter = $wp_actions = array();
     1036        }
    10351037        return $backup_globals;
    10361038}
    10371039
     
    10471049 * @global array $wp_current_filter Stores the list of current filters with the current one last.
    10481050 * @staticvar array $backup_globals Backed up globals.
    10491051 */
    1050 function _restore_plugin_globals(){
     1052function _restore_plugin_globals() {
    10511053        global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
    10521054
    1053         $backup_globals = _backup_plugin_globals();
     1055        $backup_globals = _backup_plugin_globals( false );
    10541056
    1055         if ( $wp_filter !== $backup_globals['backup_wp_filter'] ){
    1056                 $wp_filter = array_merge_recursive( $wp_filter, $backup_globals['backup_wp_filter'] );
     1057        if ( empty( $wp_filter ) ) {
     1058                $wp_filter = $backup_globals['backup_wp_filter'];
     1059        } else {
     1060                $added_filters = $wp_filter;
     1061                $wp_filter = $backup_globals['backup_wp_filter'];
     1062
     1063                foreach ( $added_filters as $tag => $callback_groups ) {
     1064                        // Loop through callback groups.
     1065                        foreach ( $callback_groups as $priority => $callbacks ) {
     1066
     1067                                // Loop through callbacks.
     1068                                foreach ( $callbacks as $cb ) {
     1069                                        add_filter( $tag, $cb['function'], $priority, $cb['accepted_args'] );
     1070                                }
     1071                        }
     1072                }
    10571073        }
    10581074
    1059         if ( $wp_actions !== $backup_globals['backup_wp_actions'] ){
    1060                 $wp_actions = array_merge_recursive( $wp_actions, $backup_globals['backup_wp_actions'] );
     1075        if ( empty ( $wp_actions ) ) {
     1076                $wp_actions = $backup_globals['backup_wp_actions'];
     1077        } else {
     1078                $run_actions = $wp_actions;
     1079                $wp_actions = $backup_globals['backup_wp_actions'];
     1080
     1081                foreach( $run_actions as $action => $count ) {
     1082                        if ( ! isset( $wp_actions[ $action ] ) ) {
     1083                                $wp_actions[ $action ] = 0;
     1084                        }
     1085
     1086                        $wp_actions[ $action ] += $count;
     1087                }
    10611088        }
    10621089
    1063         if ( $merged_filters !== $backup_globals['backup_merged_filters'] ){
     1090        if ( $merged_filters !== $backup_globals['backup_merged_filters'] ) {
    10641091                $merged_filters = array_merge_recursive( $merged_filters, $backup_globals['backup_merged_filters'] );
    10651092        }
    10661093
    1067         if ( $wp_current_filter !== $backup_globals['backup_wp_current_filter'] ){
     1094        if ( $wp_current_filter !== $backup_globals['backup_wp_current_filter'] ) {
    10681095                $wp_current_filter = array_merge_recursive( $wp_current_filter, $backup_globals['backup_wp_current_filter'] );
    10691096        }
    10701097}