Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

1 files changed, 6 insertions, 6 deletions

diff --git a/modules/exif/lib/makers/sanyo.php b/modules/exif/lib/makers/sanyo.php
index f8887970..661741dd 100644
--- a/modules/exif/lib/makers/sanyo.php
+++ b/modules/exif/lib/makers/sanyo.php
@@ -69,16 +69,16 @@ function formatSanyoData($type,$tag,$intel,$data) {
 		$data=hexdec($data);
 		
 		if($tag=="0200") { //SpecialMode
-			if($data == 0) $data = gettext("Normal");
-			else $data = gettext("Unknown").": ".$data;
+			if($data == 0) $data = (string) t("Normal");
+			else $data = (string) t("Unknown").": ".$data;
 		}
 		if($tag=="0201") { //Quality
-			if($data == 2) $data = gettext("High");
-			else $data = gettext("Unknown").": ".$data;
+			if($data == 2) $data = (string) t("High");
+			else $data = (string) t("Unknown").": ".$data;
 		}
 		if($tag=="0202") { //Macro
-			if($data == 0) $data = gettext("Normal");
-			else $data = gettext("Unknown").": ".$data;
+			if($data == 0) $data = (string) t("Normal");
+			else $data = (string) t("Unknown").": ".$data;
 		}
 	} else if($type=="UNDEFINED") {