Merge pull request #791 from PtrNrs/master

iclean(): Bypass call to iconv() if necessary
Fabrik · Jul 10, 2013 · bdb0329 · bdb0329
2 parents 81a9f05 + 0431c50
commit bdb0329
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/components/com_fabrik/helpers/string.php b/components/com_fabrik/helpers/string.php
@@ -282,7 +282,11 @@ public static function iclean($str, $fromEnc = "UTF-8", $toEnc = "ASCII//IGNORE/
 			 */
 
 			// Replace accented characters with ascii equivalent e.g. é => e
-			$str = (str_replace("'", '', @iconv($fromEnc, $toEnc, $str)));
+			$str1 = (@iconv($fromEnc, $toEnc, $str));
+			if($str1) {
+				$str = $str1;
+			}
+			$str = (str_replace("'", '', $str));
 		}
 		// Compress internal whitespace and replace with _
 		$str = preg_replace('/\s+/', '_', $str);