From: umherirrender <umherirrender_de.wp@web.de>
Date: Sat, 24 Aug 2013 17:51:07 +0000 (+0200)
Subject: Do not show empty metadata section on svgs
X-Git-Tag: 1.31.0-rc.0~18859^2
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=4d4716ce66af260bae44a087f889680d4a9f14fb;p=lhc%2Fweb%2Fwiklou.git

Do not show empty metadata section on svgs

The SvgHandler does not output all metadata, that means the returned
array can be empty. In this case return false to indicate that the
metadata section should not be added on the image description page.

Change-Id: I989154dbaaaafb2e924838c990e30a9ffe6842a9
---

diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index 28083a7fa2..4c055a5f07 100644
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -348,6 +348,7 @@ class SvgHandler extends ImageHandler {
 			'description' => 'imagedescription',
 			'title' => 'objectname',
 		);
+		$showMeta = false;
 		foreach ( $metadata as $name => $value ) {
 			$tag = strtolower( $name );
 			if ( isset( $conversion[$tag] ) ) {
@@ -356,6 +357,7 @@ class SvgHandler extends ImageHandler {
 				// Do not output other metadata not in list
 				continue;
 			}
+			$showMeta = true;
 			self::addMeta( $result,
 				in_array( $tag, $visibleFields ) ? 'visible' : 'collapsed',
 				'exif',
@@ -363,7 +365,7 @@ class SvgHandler extends ImageHandler {
 				$value
 			);
 		}
-		return $result;
+		return $showMeta ? $result : false;
 	}