From: Mark A. Hershberger <mah@nichework.com>
Date: Fri, 5 Jan 2018 00:55:40 +0000 (-0500)
Subject: Make FormatMetadata::flattenArrayReal() work for an associative array
X-Git-Tag: 1.31.0-rc.0~983
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=47a7977b150910562588de89d4c0b684fb25b091

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

Bug: T87572
Change-Id: I19490ebbbdc3613ae2116c6890ca470bb9f332db
---

diff --git a/includes/media/FormatMetadata.php b/includes/media/FormatMetadata.php
index b008a22688..f683da2c02 100644
--- a/includes/media/FormatMetadata.php
+++ b/includes/media/FormatMetadata.php
@@ -1047,7 +1047,7 @@ class FormatMetadata extends ContextSource {
 
 		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" );