From 4f0b34137b3a943067094beba2785c7e6bb93f5a Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Mon, 11 Oct 2021 18:48:25 +0200
Subject: [PATCH] replacement of hatschek letters added in
 hlp_common_helper.php to be the same as in function.inc.php

---
 application/helpers/hlp_common_helper.php | 34 ++++++++++++++---------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php
index a7eda8827..7b937d73d 100644
--- a/application/helpers/hlp_common_helper.php
+++ b/application/helpers/hlp_common_helper.php
@@ -314,32 +314,40 @@ function sanitizeProblemChars($str)
 	$enc = 'UTF-8';
 
 	$acentos = array(
-		'A' => '/&Agrave;|&Aacute;|&Acirc;|&Atilde;|&Aring;/',
+		'A' => '/&Agrave;|&Aacute;|&Acirc;|&Atilde;|&Aring;|&Abreve;|Ǎ/',
 		'Ae' => '/&Auml;/',
-		'a' => '/&agrave;|&aacute;|&acirc;|&atilde;|&aring;/',
-		'ae'=> '/&auml;/',
-		'C' => '/&Ccedil;/',
-		'c' => '/&ccedil;/',
+		'a' => '/&agrave;|&aacute;|&acirc;|&atilde;|&aring;|&abreve;|ǎ/',
+		'ae' => '/&auml;/',
+		'C' => '/&Ccedil;|&Ccaron;/',
+		'c' => '/&ccedil;|&ccaron;/',
 		'E' => '/&Egrave;|&Eacute;|&Ecirc;|&Euml;/',
 		'e' => '/&egrave;|&eacute;|&ecirc;|&euml;/',
-		'I' => '/&Igrave;|&Iacute;|&Icirc;|&Iuml;/',
-		'i' => '/&igrave;|&iacute;|&icirc;|&iuml;/',
-		'N' => '/&Ntilde;/',
+		'I' => '/&Igrave;|&Iacute;|&Icirc;|&Iuml;|Ǐ/',
+		'i' => '/&igrave;|&iacute;|&icirc;|&iuml;|ǐ/',
+		'N' => '/&Ntilde;|&Ncaron;|&ncaron;/',
 		'n' => '/&ntilde;/',
-		'O' => '/&Ograve;|&Oacute;|&Ocirc;|&Otilde;/',
+		'O' => '/&Ograve;|&Oacute;|&Ocirc;|&Otilde;|Ǒ/',
 		'Oe' => '/&Ouml;/',
-		'o' => '/&ograve;|&oacute;|&ocirc;|&otilde;/',
+		'o' => '/&ograve;|&oacute;|&ocirc;|&otilde;|ǒ/',
 		'oe' => '/&ouml;/',
-		'U' => '/&Ugrave;|&Uacute;|&Ucirc;/',
+		'R' => '/&Rcaron;/',
+		'r' => '/&rcaron;/',
+		'S' => '/&Scaron;/',
+		's' => '/&scaron;/',
+		'T' => '/&Tcaron;/',
+		't' => '/&tcaron;/',
+		'U' => '/&Ugrave;|&Uacute;|&Ucirc;|&Ubreve;|Ǔ/',
 		'Ue' => '/&Uuml;/',
-		'u' => '/&ugrave;|&uacute;|&ucirc;/',
+		'u' => '/&ugrave;|&uacute;|&ucirc;|&ubreve;|ǔ/',
 		'ue' => '/&uuml;/',
 		'Y' => '/&Yacute;/',
 		'y' => '/&yacute;|&yuml;/',
+		'Z' => '/&Zcaron;/',
+		'z' => '/&zcaron;/',
 		'a.' => '/&ordf;/',
 		'o.' => '/&ordm;/',
 		'ss' => '/&szlig;/'
 	);
 
-	return preg_replace($acentos, array_keys($acentos), htmlentities($str,ENT_NOQUOTES, $enc));
+	return preg_replace($acentos, array_keys($acentos), htmlentities($str, ENT_NOQUOTES | ENT_HTML5, $enc));
 }