dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
83b31e2
)
Make FormatMetadata::flattenArrayReal() work for an associative array
author
Mark A. Hershberger
<mah@nichework.com>
Fri, 5 Jan 2018 00:55:40 +0000
(19:55 -0500)
committer
MarkAHershberger
<mah@nichework.com>
Fri, 5 Jan 2018 17:31:38 +0000
(17:31 +0000)
Bug: T87572
Change-Id: I19490ebbbdc3613ae2116c6890ca470bb9f332db
includes/media/FormatMetadata.php
patch
|
blob
|
history
diff --git
a/includes/media/FormatMetadata.php
b/includes/media/FormatMetadata.php
index
b008a22
..
f683da2
100644
(file)
--- 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" );