Ticket #30875: 30875.4.diff

src/wp-includes/plugin.php

@@ -81 +81 @@
 function add_filter( $tag, $function_to_add, $priority = 10, $accepted_args = 1 ) {
         global $wp_filter, $merged_filters;
 
-        $idx = _wp_filter_build_unique_id($tag, $function_to_add, $priority);
-        $wp_filter[$tag][$priority][$idx] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
+        // Don't allow string values
+        if ( ! is_numeric( $priority ) ) {
+                $priority = 10;
+        }
+
+        // Cast to float and round
+        $priority = round ( (float) $priority );
+
+        $idx = _wp_filter_build_unique_id( $tag, $function_to_add, $priority );
+        $wp_filter[$tag][$priority][$idx] = array( 'function' => $function_to_add, 'accepted_args' => $accepted_args );
         unset( $merged_filters[ $tag ] );
         return true;
 }

tests/phpunit/tests/actions.php

@@ -143 +143 @@
                 $this->assertEquals($expected, $a->get_events());
         }
 
+        /**
+         * @ticket 30875
+         */
+        function test_action_priority_is_valid() {
+                $a = new MockAction();
+
+                // Test integers
+                add_action( '_test_int', array( &$a, 'action' ), 10 );
+                do_action( '_test_int' );
+                $this->assertEquals( 10, has_action( '_test_int', array( &$a, 'action' ) ) );
+
+                // Test integer as string
+                add_action( '_test_int_as_string', array( &$a, 'action' ), '9' );
+                do_action( '_test_int_as_string' );
+                $this->assertEquals( 9, has_action( '_test_int_as_string', array( &$a, 'action' ) ) );
+
+                // Test float
+                add_action( '_test_float', array( &$a, 'action' ), 8.1 );
+                do_action( '_test_float' );
+                $this->assertEquals( 8, has_action( '_test_float', array( &$a, 'action' ) ) );
+
+                // Test float as string
+                add_action( '_test_float_as_string', array( &$a, 'action' ), '7.2' );
+                do_action( '_test_float_as_string' );
+                $this->assertEquals( 7, has_action( '_test_float_as_string', array( &$a, 'action' ) ) );
+
+                // Test string
+                add_action( '_test_string', array( &$a, 'action' ), 'micky' );
+                do_action( '_test_string' );
+                $this->assertEquals( 10, has_action( '_test_string', array( &$a, 'action' ) ) );
+
+                // Test boolean
+                add_action( '_test_bool', array( &$a, 'action' ), true );
+                do_action( '_test_bool' );
+                $this->assertEquals( 10, has_action( '_test_bool', array( &$a, 'action' ) ) );
+
+                // Test boolean as string
+                add_action( '_test_bool_as_string', array( &$a, 'action' ), 'true' );
+                do_action( '_test_bool_as_string' );
+                $this->assertEquals( 10, has_action( '_test_bool_as_string', array( &$a, 'action' ) ) );
+                
+                // Test array
+                add_action( '_test_array', array( &$a, 'action' ), array() );
+                do_action( '_test_array' );
+                $this->assertEquals( 10, has_action( '_test_array', array( &$a, 'action' ) ) );
+                
+                // Test object
+                add_action( '_test_oject', array( &$a, 'action' ), new stdClass() );
+                do_action( '_test_oject' );
+                $this->assertEquals( 10, has_action( '_test_oject', array( &$a, 'action' ) ) );
+        }
+
         function test_did_action() {
                 $tag1 = rand_str();
                 $tag2 = rand_str();