Changeset 38437

Timestamp:

08/30/2016 03:06:06 AM (8 years ago)

Author:

boonebgorges

Message:

Remove unnecessary uniqueness check in get_attachment_taxonomies().

Running the taxonomy array through array_unique() is unnecessary
when the function returns objects, because the associative keys already
ensure uniqueness.

This also fixes a bug when running get_attachment_taxonomies() in
HHVM, which doesn't like casting objects to strings for the purposes
of array_unique().

Props swissspidy.
See #37368.

Location:

trunk

Files:

• src/wp-includes/media.php (modified) (1 diff)
• tests/phpunit/tests/media/getAttachmentTaxonomies.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -2750 +2750 @@
     }
 
-    return array_unique($taxonomies);
+    if ( 'names' === $output ) {
+        $taxonomies = array_unique( $taxonomies );
+    }
+
+    return $taxonomies;
 }
 

trunk/tests/phpunit/tests/media/getAttachmentTaxonomies.php

@@ -99 +99 @@
         $this->assertSame( 'wptests_tax2', $found['wptests_tax2']->name );
     }
+
+
+    /**
+     * @ticket 37368
+     */
+    public function test_should_return_unique_taxonomies_for_output_objects() {
+        register_taxonomy( 'wptests_tax2', array( 'attachment:image', 'attachment:image/jpeg' ) );
+
+        $a = self::factory()->attachment->create_object( 'image.jpg', 0, array(
+            'post_mime_type' => 'image/jpeg',
+            'post_type' => 'attachment'
+        ) );
+        $attachment = get_post( $a );
+
+        $found = get_attachment_taxonomies( $attachment, 'objects' );
+
+        $this->assertSame( array( 'wptests_tax2' ), array_keys( $found ) );
+        $this->assertInternalType( 'object', $found['wptests_tax2'] );
+        $this->assertSame( 'wptests_tax2', $found['wptests_tax2']->name );
+    }
 }