hardening utf conversion.

jmturner · Jan 25, 2022 · 0a43f37 · 0a43f37
1 parent badb81d
commit 0a43f37
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/owa_lib.php b/owa_lib.php
@@ -1069,7 +1069,16 @@ public static function utf8Encode($string) {
             return $string;
         } else {
             if (function_exists('iconv')) {
-                return iconv(mb_detect_encoding( $string ),'UTF-8//TRANSLIT', $string);
+
+	            if ( function_exists( 'mb_detect_encoding' ) ) {
+
+		            return iconv(mb_detect_encoding( $string ),'UTF-8//TRANSLIT', $string);
+
+		        } else {
+
+			    	return iconv('UTF-8','UTF-8//TRANSLIT', $string);    
+		        }
+
             } else {
                 // at least worth a try
                 return utf8_encode($string);