# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1504527673 -10800
# Node ID 6c1467fe7d5cd3db3dc583ee23c9d1c33363fb8d
# Parent  049be4ab457a717691f7b5f80291ddb7c023169f
Use a wrapper function for making the image metadata information box generation a bit simpler.

diff -r 049be4ab457a -r 6c1467fe7d5c mgallery.php
--- a/mgallery.php	Mon Sep 04 15:10:35 2017 +0300
+++ b/mgallery.php	Mon Sep 04 15:21:13 2017 +0300
@@ -545,6 +545,12 @@
 }
 
 
+function mgGetArrStr($data, $skeys, $sfmt1, $func = NULL)
+{
+  return mgGetArr($data, $skeys, $sfmt1, NULL, ($func == NULL) ? "chentities" : $func);
+}
+
+
 //
 // Print page header, etc.
 //
@@ -557,14 +563,14 @@
   $data = $galEntries[$galImage];
 
   $list = [
-    mgGetArr($data, ["width", "height"], "<span class=\"infoDimensions\"><b>%1</b> x <b>%2</b> px</span>", NULL),
-    mgGetArr($data, "model", "<span class=\"infoModel\"><b>%1</b></span>", NULL),
-    mgGetArr($data, "fnumber", "<span class=\"infoFNumber\"><b>f/%1</b></span>", NULL),
-    mgGetArr($data, "exposure", "<span class=\"infoExposure\"><b>%1</b> sec</span>", NULL, NULL),
-    mgGetArr($data, "iso", "<span class=\"infoISO\">ISO <b>%1</b></span>", NULL),
-    mgGetArr($data, "focallength", "<span class=\"infoFocalLength\">F-L <b>%1</b>mm</span>", NULL),
-    mgGetArr($data, "lensmodel", "<span class=\"infoLensModel\"><i>%1</i></span>", NULL),
-    mgGetArr($data, "filesize", "<span class=\"infoFileSize\">%1</span>", "", "mgFileSize"),
+    mgGetArrStr($data, ["width", "height"], "<span class=\"infoDimensions\"><b>%1</b> x <b>%2</b> px</span>"),
+    mgGetArrStr($data, "model", "<span class=\"infoModel\"><b>%1</b></span>"),
+    mgGetArrStr($data, "fnumber", "<span class=\"infoFNumber\"><b>f/%1</b></span>"),
+    mgGetArrStr($data, "exposure", "<span class=\"infoExposure\"><b>%1</b> sec</span>"),
+    mgGetArrStr($data, "iso", "<span class=\"infoISO\">ISO <b>%1</b></span>"),
+    mgGetArrStr($data, "focallength", "<span class=\"infoFocalLength\">F-L <b>%1</b>mm</span>"),
+    mgGetArrStr($data, "lensmodel", "<span class=\"infoLensModel\"><i>%1</i></span>"),
+    mgGetArrStr($data, "filesize", "<span class=\"infoFileSize\">%1</span>", "mgFileSize"),
   ];
 
   $pageTitle = $galTitlePrefix.$galTitleSep.mgGetTrans($galData["caption"])." - ".$galImage;
@@ -586,7 +592,7 @@
     "</div>\n".
     mgGetNaviControlImageBoxJS($galImagesIndex, $index, "nextBtm", 1)."\n".
     mgGetNaviControlImageBox($galImagesIndex, $index, "next", 1)."\n".
-    "<div class=\"imageCaption\">".mgGetArr($data, "caption", "%1", "")."</div>\n".
+    (isset($data["caption"]) ? "<div class=\"imageCaption\">".mgGetArrStr($data, "caption", "%1")."</div>\n" : "").
     "<div class=\"infoBox\">\n".
     mgGetArr($data, "datetime", "<span class=\"infoDateTime\">%1</span>\n", "", "mgTimeStr").
     implode(",\n", array_filter($list, function($a) { return $a !== NULL; }))."\n".