diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2009-11-15 19:44:47 -0800 |
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2009-11-15 19:44:47 -0800 |
| commit | 0733dc37fda27a5ba35f9020edf3c66aa41a95a0 (patch) | |
| tree | 6877946232f1b01b1c8709054c689f6658cef34f /modules/exif/lib/makers/olympus.php | |
| parent | 218493c50be9362d4abed6900a816308fee5d978 (diff) | |
| parent | 9379308f91a476f790fb8d444536719535c584e4 (diff) | |
Merge commit 'upstream/master'
Conflicts:
modules/gallery/tests/xss_data.txt
Diffstat (limited to 'modules/exif/lib/makers/olympus.php')
| -rw-r--r-- | modules/exif/lib/makers/olympus.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/exif/lib/makers/olympus.php b/modules/exif/lib/makers/olympus.php index 3f254570..17334bd8 100644 --- a/modules/exif/lib/makers/olympus.php +++ b/modules/exif/lib/makers/olympus.php @@ -80,12 +80,12 @@ function formatOlympusData($type,$tag,$intel,$data) { if($data == 1) $data = "SQ"; else if($data == 2) $data = "HQ"; else if($data == 3) $data = "SHQ"; - else $data = gettext("Unknown").": ".$data; + else $data = (string) t("Unknown").": ".$data; } if($tag=="0202") { //Macro if($data == 0) $data = "Normal"; else if($data == 1) $data = "Macro"; - else $data = gettext("Unknown").": ".$data; + else $data = (string) t("Unknown").": ".$data; } } else if($type=="UNDEFINED") { |