Strings::toAscii() removes combining character [Closes #614]

nette · Jul 30, 2012 · 18023a0 · 18023a0
1 parent 077d99b
commit 18023a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Nette/Utils/Strings.php b/Nette/Utils/Strings.php
@@ -163,7 +163,7 @@ public static function normalize($s)
 	 */
 	public static function toAscii($s)
 	{
-		$s = preg_replace('#[^\x09\x0A\x0D\x20-\x7E\xA0-\x{10FFFF}]#u', '', $s);
+		$s = preg_replace('#[^\x09\x0A\x0D\x20-\x7E\xA0-\x{2FF}\x{370}-\x{10FFFF}]#u', '', $s);
 		$s = strtr($s, '`\'"^~', "\x01\x02\x03\x04\x05");
 		if (ICONV_IMPL === 'glibc') {
 			$s = @iconv('UTF-8', 'WINDOWS-1250//TRANSLIT', $s); // intentionally @

diff --git a/tests/Nette/Utils/Strings.toAscii().phpt b/tests/Nette/Utils/Strings.toAscii().phpt
@@ -17,4 +17,5 @@ require __DIR__ . '/../bootstrap.php';
 
 
 Assert::same( 'ZLUTOUCKY KUN oooo', Strings::toAscii("\xc5\xbdLU\xc5\xa4OU\xc4\x8cK\xc3\x9d K\xc5\xae\xc5\x87 \xc3\xb6\xc5\x91\xc3\xb4o") ); // ŽLUŤOUČKÝ KŮŇ öőôo
+Assert::same( 'Zlutoucky kun', Strings::toAscii("Z\xCC\x8Clut\xCC\x8Couc\xCC\x8Cky\xCC\x81 ku\xCC\x8An\xCC\x8C") ); // Žluťoučký kůň with combining characters
 Assert::same( 'Z `\'"^~', Strings::toAscii("\xc5\xbd `'\"^~") );