From c72d29e63e6705a43df5b6cbb72e0fe8752c6a3f Mon Sep 17 00:00:00 2001 From: Helen Hou-Sandi Date: Wed, 23 Jul 2014 02:22:57 +0000 Subject: [PATCH] Revert [29267], as it causes unit test breakage and appears unnecessary. see #28986. git-svn-id: https://develop.svn.wordpress.org/trunk@29274 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/includes/testcase.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/phpunit/includes/testcase.php b/tests/phpunit/includes/testcase.php index c5960bd162..ba66439798 100644 --- a/tests/phpunit/includes/testcase.php +++ b/tests/phpunit/includes/testcase.php @@ -11,12 +11,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase { protected $expected_doing_it_wrong = array(); protected $caught_doing_it_wrong = array(); - protected static $hooks_saved = array( - 'merged_filters' => array(), - 'wp_actions' => array(), - 'wp_current_filter' => array(), - 'wp_filter' => array(), - ); + protected static $hooks_saved = array(); protected static $ignore_files; /** @@ -106,7 +101,7 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase { $GLOBALS[ $key ] = self::$hooks_saved[ $key ]; } } - + function flush_cache() { global $wp_object_cache; $wp_object_cache->group_ops = array();