Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/170743
Change subject: Remove wrapper arrays coming from EXIF ...................................................................... Remove wrapper arrays coming from EXIF Bug: 72652 Change-Id: Icc107da2928915da306d96692b79c614eaf0acb4 Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/973 --- M includes/filerepo/file/File.php 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/43/170743/1 diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php index 7563d64..6f369c1 100644 --- a/includes/filerepo/file/File.php +++ b/includes/filerepo/file/File.php @@ -634,7 +634,15 @@ return false; } - return $handler->getCommonMetaArray( $this ); + $metaArray = $handler->getCommonMetaArray( $this ); + + foreach ( $metaArray as &$val ) { + if ( is_array( $val ) && count( $val ) == 1 ) { + $val = array_pop( $val ); + } + } + + return $metaArray; } /** -- To view, visit https://gerrit.wikimedia.org/r/170743 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icc107da2928915da306d96692b79c614eaf0acb4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gilles <gdu...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
