jenkins-bot has submitted this change and it was merged.
Change subject: Invalid argument supplied for foreach() in FormatMetadata.php
on line 1566
......................................................................
Invalid argument supplied for foreach() in FormatMetadata.php on line 1566
Bug: 56585
Change-Id: I5f65333cc94b66fd80fcf5abcfad7e10e4669310
---
M includes/media/FormatMetadata.php
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/media/FormatMetadata.php
b/includes/media/FormatMetadata.php
index b34ad65..91c4c9a 100755
--- a/includes/media/FormatMetadata.php
+++ b/includes/media/FormatMetadata.php
@@ -1563,11 +1563,13 @@
$common = $file->getCommonMetaArray();
- foreach ( $common as $key => $value ) {
- $fileMetadata[$key] = array(
- 'value' => $value,
- 'source' => 'file-metadata',
- );
+ if ( $common !== false ) {
+ foreach ( $common as $key => $value ) {
+ $fileMetadata[$key] = array(
+ 'value' => $value,
+ 'source' => 'file-metadata',
+ );
+ }
}
wfProfileOut( __METHOD__ );
--
To view, visit https://gerrit.wikimedia.org/r/93616
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f65333cc94b66fd80fcf5abcfad7e10e4669310
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
