Changeset 29422

Timestamp:

08/07/2014 02:29:15 AM (12 years ago)

Author:

wonderboymusic

Message:

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

Adds unit tests.

Props boonebgorges.
Fixes #29070.

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

@@ -108 +108 @@
         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;

trunk/tests/phpunit/tests/filters.php

@@ -268 +268 @@
                 $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 ) );
+        }
 }