MarkAHershberger has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/402151 )

Change subject: Make FormatMetadata::flattenArrayReal() work for for an 
associative array
......................................................................

Make FormatMetadata::flattenArrayReal() work for for an associative array

Bug: T87572
Change-Id: I19490ebbbdc3613ae2116c6890ca470bb9f332db
---
M includes/media/FormatMetadata.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/51/402151/1

diff --git a/includes/media/FormatMetadata.php 
b/includes/media/FormatMetadata.php
index b008a22..f683da2 100644
--- a/includes/media/FormatMetadata.php
+++ b/includes/media/FormatMetadata.php
@@ -1047,7 +1047,7 @@
 
                if ( !is_array( $vals ) ) {
                        return $vals; // do nothing if not an array;
-               } elseif ( count( $vals ) === 1 && $type !== 'lang' ) {
+               } elseif ( count( $vals ) === 1 && $type !== 'lang' && isset( 
$vals[0] ) ) {
                        return $vals[0];
                } elseif ( count( $vals ) === 0 ) {
                        wfDebug( __METHOD__ . " metadata array with 0 
elements!\n" );

-- 
To view, visit https://gerrit.wikimedia.org/r/402151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19490ebbbdc3613ae2116c6890ca470bb9f332db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger <m...@nichework.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to