Ticket #20920: 20920.2.diff

src/wp-includes/plugin.php

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

tests/phpunit/tests/filters.php

@@ -197 +197 @@
         }
 
         /**
+         * @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
          */
         function test_filter_ref_array() {