sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

After [28883], ensure that priorities have callbacks before returning `true` in `has_filter()`. 

Adds unit tests.

Props boonebgorges.
Fixes #29070.


git-svn-id: https://develop.svn.wordpress.org/trunk@29422 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2014-08-07 02:29:15 +00:00
parent e9ba499f23
commit 06eea1b33d
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/wp-includes/plugin.php
View File

@ -107,7 +107,23 @@ function add_filter( $tag, $function_to_add, $priority = 10, $accepted_args = 1
function has_filter($tag, $function_to_check = false) {
global $wp_filter;
$has = !empty($wp_filter[$tag]);
$has = ! empty( $wp_filter[ $tag ] );
// Make sure at least one priority has a filter callback
if ( $has ) {
$exists = false;
foreach ( $wp_filter[ $tag ] as $callbacks ) {
if ( ! empty( $callbacks ) ) {
$exists = true;
break;
}
}
if ( ! $exists ) {
$has = false;
}
}
if ( false === $function_to_check || false == $has )
return $has;

26
tests/phpunit/tests/filters.php
View File

@ -267,4 +267,30 @@ class Tests_Filters extends WP_UnitTestCase {
$this->assertEquals( 1, $b->get_call_count(), 'priority 12 filters should run after priority 10 empties itself and priority 11 runs' );
$this->assertEquals( $result, $tag . '_append_append', 'priority 11 and 12 filters should run after priority 10 empties itself' );
}
/**
* @ticket 29070
*/
function test_has_filter_after_remove_all_filters() {
$a = new MockAction();
$tag = rand_str();
$val = rand_str();
// No priority
add_filter( $tag, array( $a, 'filter' ), 11 );
add_filter( $tag, array( $a, 'filter' ), 12 );
$this->assertTrue( has_filter( $tag ) );
remove_all_filters( $tag );
$this->assertFalse( has_filter( $tag ) );
// Remove priorities one at a time
add_filter( $tag, array( $a, 'filter' ), 11 );
add_filter( $tag, array( $a, 'filter' ), 12 );
$this->assertTrue( has_filter( $tag ) );
remove_all_filters( $tag, 11 );
remove_all_filters( $tag, 12 );
$this->assertFalse( has_filter( $tag ) );
}
}