libi2ncommon: (tomj) fix iso_to_html() function

diff --git a/src/stringfunc.cpp b/src/stringfunc.cpp
index 2caf99e..182dd26 100644 (file)
--- a/src/stringfunc.cpp
+++ b/src/stringfunc.cpp
@@ -82,14 +82,6 @@ std::string utf8_to_iso(const std::string& utf8string)
 std::string iso_to_html(const std::string& isostring, bool showerr_bug)
 {
     string result = isostring;
-    
-    replace_all (result, "ä", "ä");
-    replace_all (result, "ö", "ö");
-    replace_all (result, "ü", "ü");
-    replace_all (result, "Ä", "Ä");
-    replace_all (result, "Ö", "Ö");
-    replace_all (result, "Ü", "Ü");
-    replace_all (result, "ß", "ß");
 
     // TODO: This needs to be removed soon by a proper 
     // HTML quoted chars engine. Then we can also remove ü from i18n files.
@@ -100,6 +92,14 @@ std::string iso_to_html(const std::string& isostring, bool showerr_bug)
         replace_all (result, ">", ">");
     }
     
+    replace_all (result, "ä", "ä");
+    replace_all (result, "ö", "ö");
+    replace_all (result, "ü", "ü");
+    replace_all (result, "Ä", "Ä");
+    replace_all (result, "Ö", "Ö");
+    replace_all (result, "Ü", "Ü");
+    replace_all (result, "ß", "ß");
+    
     return result;
 }