When detecting encodings, give priority to ISO-8859-1 which seems to

solve the umlaut problem in IPTC data.  Fixes ticket #1144.

1 files changed, 2 insertions, 1 deletions

diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php
index 1a593d3f..7fe9fba3 100644
--- a/modules/tag/helpers/tag_event.php
+++ b/modules/tag/helpers/tag_event.php
@@ -36,7 +36,8 @@ class tag_event_Core {
             $tag = str_replace("\0",  "", $tag);
             foreach (explode(",", $tag) as $word) {
               $word = trim($word);
-              if (function_exists("mb_detect_encoding") && mb_detect_encoding($word) != "UTF-8") {
+              if (function_exists("mb_detect_encoding") &&
+                  mb_detect_encoding($word, "ISO-8859-1, UTF-8") != "UTF-8") {
                 $word = utf8_encode($word);
               }
               $tags[$word] = 1;