Merge pull request #1110 from francescom/master

Incapsulated definitions of mb_ord and mb_chr into a if(!function_exi…
Codiad · Mar 21, 2020 · b2ef139 · b2ef139
2 parents 97f1331 + dbd94f8
commit b2ef139
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/lib/diff_match_patch.php b/lib/diff_match_patch.php
@@ -2071,14 +2071,18 @@ function __toString(){
 function charCodeAt($str, $pos) {
 	return mb_ord(mb_substr($str, $pos, 1));
 }
-function mb_ord($v) {
-	$k = mb_convert_encoding($v, 'UCS-2LE', 'UTF-8'); 
-	$k1 = ord(substr($k, 0, 1)); 
-	$k2 = ord(substr($k, 1, 1)); 
-	return $k2 * 256 + $k1; 
+if(!function_exists('mb_ord')) {
+	function mb_ord($v) {
+		$k = mb_convert_encoding($v, 'UCS-2LE', 'UTF-8'); 
+		$k1 = ord(substr($k, 0, 1)); 
+		$k2 = ord(substr($k, 1, 1)); 
+		return $k2 * 256 + $k1; 
+	}
 }
-function mb_chr($num){
-	return mb_convert_encoding('&#'.intval($num).';', 'UTF-8', 'HTML-ENTITIES');
+if(!function_exists('mb_chr')) {
+	function mb_chr($num){
+		return mb_convert_encoding('&#'.intval($num).';', 'UTF-8', 'HTML-ENTITIES');
+	}
 }
 
 /**