Changeset 46568

Timestamp:

10/22/2019 12:09:39 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Plugins: Restore backward compatibility for PHP4-style passing of array( &$this ) as action argument to do_action().

This is a follow-up to [46149] to avoid unnecessary breakage in case of using the old notation.

Props david.binda, jrf.
Reviewed by azaozz.
Fixes #48312.

Location:

trunk

Files:

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

trunk/src/wp-includes/plugin.php

@@ -471 +471 @@
     if ( empty( $arg ) ) {
         $arg[] = '';
+    } elseif ( is_array( $arg[0] ) && 1 === count( $arg[0] ) && isset( $arg[0][0] ) && is_object( $arg[0][0] ) ) {
+        // Backward compatibility for PHP4-style passing of `array( &$this )` as action `$arg`.
+        $arg[0] = $arg[0][0];
     }
 

trunk/tests/phpunit/tests/actions.php

@@ -152 +152 @@
         $argsvar3 = $a3->get_args();
         $this->assertEquals( array( $val1, $val2 ), array_pop( $argsvar3 ) );
+    }
+
+    /**
+     * Tests PHP 4 notation for calling actions while passing in an object by reference.
+     *
+     * @ticket 48312
+     */
+    function test_action_args_with_php4_syntax() {
+        $a   = new MockAction();
+        $tag = __FUNCTION__;
+        $val = new stdClass;
+
+        add_action( $tag, array( &$a, 'action' ) );
+        // Ñall the action with PHP 4 notation for passing object by reference.
+        do_action( $tag, array( &$val ) );
+
+        $call_count = $a->get_call_count();
+        $argsvar    = $a->get_args();
+        $this->assertSame( array( $val ), array_pop( $argsvar ) );
     }