Changeset 34102

Timestamp:

09/14/2015 01:22:23 AM (9 years ago)

Author:

wonderboymusic

Message:

Objects are passed by-reference since PHP 5. In _get_custom_object_labels(), cast $object->labels back to object before returning. This function is weird.

Adds unit test.

Props Toro_Unit.
Fixes #33023.

Location:

trunk

Files:

• src/wp-includes/post-functions.php (modified) (1 diff)
• tests/phpunit/tests/post/types.php (modified) (1 diff)

trunk/src/wp-includes/post-functions.php

@@ -1394 +1394 @@
     }
     $labels = array_merge( $defaults, $object->labels );
+    $object->labels = (object) $object->labels;
+    
     return (object) $labels;
 }

trunk/tests/phpunit/tests/post/types.php

@@ -143 +143 @@
         $this->assertFalse( post_type_exists( 'foo' ) );
     }
+
+    /**
+     * @ticket 33023
+     */
+    public function test_get_post_type_object_casting() {
+        register_post_type( 'foo' );
+
+        $before = get_post_type_object( 'foo' )->labels;
+
+        get_post_type_labels( get_post_type_object( 'foo' ) );
+
+        $after = get_post_type_object( 'foo' )->labels;
+
+        $this->assertEquals( $before, $after );
+
+        _unregister_post_type( 'foo' );
+    }
 }