sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unnecessary uniqueness check in get_attachment_taxonomies().

Browse Source 
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.

git-svn-id: https://develop.svn.wordpress.org/trunk@38437 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2016-08-30 03:06:06 +00:00
parent 7105787ced
commit 53016dd3aa
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-includes/media.php
View File

@ -2749,7 +2749,11 @@ function get_attachment_taxonomies( $attachment, $output = 'names' ) {
}
}
return array_unique($taxonomies);
if ( 'names' === $output ) {
$taxonomies = array_unique( $taxonomies );
}
return $taxonomies;
}
/**

20
tests/phpunit/tests/media/getAttachmentTaxonomies.php
View File

@ -98,4 +98,24 @@ class Tests_Media_GetAttachmentTaxonomies extends WP_UnitTestCase {
$this->assertInternalType( 'object', $found['wptests_tax2'] );
$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 );
}
}