Changeset 31014

Timestamp:

12/31/2014 07:06:29 PM (10 years ago)

Author:

boonebgorges

Message:

In remove_all_filters(), only remove callbacks that match the $priority parameter.

Props GeertDD, valendesigns.
Fixes #20920.

Location:

trunk

Files:

• src/wp-includes/plugin.php (modified) (1 diff)
• tests/phpunit/tests/filters.php (modified) (1 diff)

trunk/src/wp-includes/plugin.php

@@ -326 +326 @@
 
     if ( isset( $wp_filter[ $tag ]) ) {
-        if ( false !== $priority && isset( $wp_filter[ $tag ][ $priority ] ) ) {
+        if ( false === $priority ) {
+            $wp_filter[ $tag ] = array();
+        } else if ( isset( $wp_filter[ $tag ][ $priority ] ) ) {
             $wp_filter[ $tag ][ $priority ] = array();
-        } else {
-            $wp_filter[ $tag ] = array();
         }
     }

trunk/tests/phpunit/tests/filters.php

@@ -198 +198 @@
 
     /**
+     * @ticket 20920
+     */
+    function test_remove_all_filters_should_respect_the_priority_argument() {
+        $a = new MockAction();
+        $tag = rand_str();
+        $val = rand_str();
+
+        add_filter( $tag, array( $a, 'filter' ), 12 );
+        $this->assertTrue( has_filter( $tag ) );
+
+        // Should not be removed.
+        remove_all_filters( $tag, 11 );
+        $this->assertTrue( has_filter( $tag ) );
+
+        remove_all_filters( $tag, 12 );
+        $this->assertFalse( has_filter( $tag ) );
+    }
+
+    /**
      * @ticket 9886
      */