Ticket #17817: 17817.25.diff

tests/phpunit/includes/functions.php

@@ -23 +23 @@
 function tests_add_filter($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
         global $wp_filter;
 
-        $idx = _test_filter_build_unique_id($tag, $function_to_add, $priority);
-        $wp_filter[$tag][$priority][$idx] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
+        $idx = _test_filter_build_unique_id( $tag, $function_to_add, $priority );
+
+        if ( class_exists( 'WP_Hook' ) ) {
+                if ( ! isset( $wp_filter[ $tag ] ) ) {
+                        $wp_filter[ $tag ] = new WP_Hook();
+                }
+
+                $wp_filter[ $tag ]->callbacks[ $priority ][ $idx ] = array(
+                        'function' => $function_to_add,
+                        'accepted_args' => $accepted_args,
+                );
+        } else {
+                // WP has not loaded yet. Hook will be normalized on WP bootstrap.
+                $wp_filter[$tag][$priority][$idx] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
+        }
+
         return true;
 }