Ticket #10441: 10441.4.diff

src/wp-includes/plugin.php

@@ -674 +674 @@
  */
 function apply_filters_deprecated( $tag, $args, $version, $replacement = false, $message = null ) {
         if ( ! has_filter( $tag ) ) {
-                return;
+                return $args[0];
         }
 
         _deprecated_hook( $tag, $version, $replacement, $message );

tests/phpunit/tests/actions.php

@@ -364 +364 @@
                 _backup_plugin_globals();
 
                 $wp_actions = array();
-                
+
                 $this->assertEmpty( $wp_actions );
                 _restore_plugin_globals();
 
@@ -383 +383 @@
                 $a = new MockAction();
                 $tag = rand_str();
                 add_action($tag, array(&$a, 'action'));
-                
+
                 $this->assertNotEquals( $GLOBALS['wp_filter'], $original_filter );
 
                 _restore_plugin_globals();
@@ -458 +458 @@
                 $p1->post_title = 'Bar1';
                 $p2->post_title = 'Bar2';
         }
-
-        /**
-         * @ticket 10441
-         * @expectedDeprecated tests_apply_filters_deprecated
-         */
-        public function test_apply_filters_deprecated() {
-                $p = 'Foo';
-
-                add_filter( 'tests_apply_filters_deprecated', array( __CLASS__, 'deprecated_filter_callback' ) );
-                $p = apply_filters_deprecated( 'tests_apply_filters_deprecated', array( $p ), '4.6' );
-                remove_filter( 'tests_apply_filters_deprecated', array( __CLASS__, 'deprecated_filter_callback' ) );
-
-                $this->assertSame( 'Bar', $p );
-        }
-
-        public static function deprecated_filter_callback( $p ) {
-                $p = 'Bar';
-                return $p;
-        }
-
-        /**
-         * @ticket 10441
-         * @expectedDeprecated tests_apply_filters_deprecated
-         */
-        public function test_apply_filters_deprecated_with_multiple_params() {
-                $p1 = 'Foo1';
-                $p2 = 'Foo2';
-
-                add_filter( 'tests_apply_filters_deprecated', array( __CLASS__, 'deprecated_filter_callback_multiple_params' ), 10, 2 );
-                $p1 = apply_filters_deprecated( 'tests_apply_filters_deprecated', array( $p1, $p2 ), '4.6' );
-                remove_filter( 'tests_apply_filters_deprecated', array( __CLASS__, 'deprecated_filter_callback_multiple_params' ), 10, 2 );
-
-                $this->assertSame( 'Bar1', $p1 );
-
-                // Not passed by reference, so not modified.
-                $this->assertSame( 'Foo2', $p2 );
-        }
-
-        public static function deprecated_filter_callback_multiple_params( $p1, $p2 ) {
-                $p1 = 'Bar1';
-                $p2 = 'Bar2';
-
-                return $p1;
-        }
 }

tests/phpunit/tests/filters.php

@@ -315 +315 @@
                 $the_ = current( $filters );
                 $this->assertEquals( $the_['function'], array( $this, '_action_test_has_filter_doesnt_reset_wp_filter' ) );
          }
+
+        /**
+         * @ticket 10441
+         * @expectedDeprecated tests_apply_filters_deprecated
+         */
+        public function test_apply_filters_deprecated() {
+                $p = 'Foo';
+
+                add_filter( 'tests_apply_filters_deprecated', array( __CLASS__, 'deprecated_filter_callback' ) );
+                $p = apply_filters_deprecated( 'tests_apply_filters_deprecated', array( $p ), '4.6' );
+                remove_filter( 'tests_apply_filters_deprecated', array( __CLASS__, 'deprecated_filter_callback' ) );
+
+                $this->assertSame( 'Bar', $p );
+        }
+
+        public static function deprecated_filter_callback( $p ) {
+                $p = 'Bar';
+                return $p;
+        }
+
+        /**
+         * @ticket 10441
+         * @expectedDeprecated tests_apply_filters_deprecated
+         */
+        public function test_apply_filters_deprecated_with_multiple_params() {
+                $p1 = 'Foo1';
+                $p2 = 'Foo2';
+
+                add_filter( 'tests_apply_filters_deprecated', array( __CLASS__, 'deprecated_filter_callback_multiple_params' ), 10, 2 );
+                $p1 = apply_filters_deprecated( 'tests_apply_filters_deprecated', array( $p1, $p2 ), '4.6' );
+                remove_filter( 'tests_apply_filters_deprecated', array( __CLASS__, 'deprecated_filter_callback_multiple_params' ), 10, 2 );
+
+                $this->assertSame( 'Bar1', $p1 );
+
+                // Not passed by reference, so not modified.
+                $this->assertSame( 'Foo2', $p2 );
+        }
+
+        public static function deprecated_filter_callback_multiple_params( $p1, $p2 ) {
+                $p1 = 'Bar1';
+                $p2 = 'Bar2';
+
+                return $p1;
+        }
+
+        /**
+         * @ticket 10441
+         * @expectedDeprecated tests_apply_filters_deprecated
+         */
+        public function test_apply_filters_deprecated_without_filter() {
+                $val = 'Foobar';
+
+                $this->assertSame( $val, apply_filters_deprecated( 'tests_apply_filters_deprecated', array( $val ), '4.6' ) );
+        }
 }