From 28d07d8254a28f796694d16e616928446ea4e0b0 Mon Sep 17 00:00:00 2001
From: Francois Gaillard <francois.gaillard@prestashop.com>
Date: Wed, 3 Oct 2012 09:11:37 +0000
Subject: [PATCH] [*] Classes : Tools::replaceAccentedChars() method improved
 (lowercase/uppercase chars)

---
 classes/Tools.php | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/classes/Tools.php b/classes/Tools.php
index 45dd168b6..a41502356 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -998,26 +998,45 @@ class ToolsCore
 	public static function replaceAccentedChars($str)
 	{
 		$patterns = array(
-			'/[\x{0105}\x{0104}\x{00E0}\x{00E1}\x{00E2}\x{00E3}\x{00E4}\x{00E5}]/u',
-			'/[\x{00E7}\x{010D}\x{0107}\x{0106}]/u',
+			/* Lowercase */
+			'/[\x{0105}\x{00E0}\x{00E1}\x{00E2}\x{00E3}\x{00E4}\x{00E5}]/u',
+			'/[\x{00E7}\x{010D}\x{0107}]/u',
 			'/[\x{010F}]/u',
-			'/[\x{00E8}\x{00E9}\x{00EA}\x{00EB}\x{011B}\x{0119}\x{0118}]/u',
+			'/[\x{00E8}\x{00E9}\x{00EA}\x{00EB}\x{011B}\x{0119}]/u',
 			'/[\x{00EC}\x{00ED}\x{00EE}\x{00EF}]/u',
-			'/[\x{0142}\x{0141}\x{013E}\x{013A}]/u',
+			'/[\x{0142}\x{013E}\x{013A}]/u',
 			'/[\x{00F1}\x{0148}]/u',
-			'/[\x{00F2}\x{00F3}\x{00F4}\x{00F5}\x{00F6}\x{00F8}\x{00D3}]/u',
+			'/[\x{00F2}\x{00F3}\x{00F4}\x{00F5}\x{00F6}\x{00F8}]/u',
 			'/[\x{0159}\x{0155}]/u',
-			'/[\x{015B}\x{015A}\x{0161}]/u',
+			'/[\x{015B}\x{0161}]/u',
 			'/[\x{00DF}]/u',
 			'/[\x{0165}]/u',
 			'/[\x{00F9}\x{00FA}\x{00FB}\x{00FC}\x{016F}]/u',
 			'/[\x{00FD}\x{00FF}]/u',
-			'/[\x{017C}\x{017A}\x{017B}\x{0179}\x{017E}]/u',
+			'/[\x{017C}\x{017A}\x{017E}]/u',
 			'/[\x{00E6}]/u',
-			'/[\x{0153}]/u'
-		);
+			'/[\x{0153}]/u',
 
-		$replacements = array('a', 'c', 'd', 'e', 'i', 'l', 'n', 'o', 'r', 's', 'ss', 't', 'u', 'y', 'z', 'ae', 'oe');
+			/* Uppercase */
+			'/[\x{0104}\x{00C0}\x{00C1}\x{00C2}\x{00C3}\x{00C4}\x{00C5}]/u',
+			'/[\x{00C7}\x{010C}\x{0106}]/u',
+			'/[\x{010E}]/u',
+			'/[\x{00C8}\x{00C9}\x{00CA}\x{00CB}\x{011A}\x{0118}]/u',
+			'/[\x{0141}\x{013D}\x{0139}]/u',
+			'/[\x{00D1}\x{0147}]/u',
+			'/[\x{00D3}]/u',
+			'/[\x{0158}\x{0154}]/u',
+			'/[\x{015A}\x{0160}]/u',
+			'/[\x{0164}]/u',
+			'/[\x{00D9}\x{00DA}\x{00DB}\x{00DC}\x{016E}]/u',
+			'/[\x{017B}\x{0179}\x{017D}]/u',
+			'/[\x{00C6}]/u',
+			'/[\x{0152}]/u');
+
+		$replacements = array(
+				'a', 'c', 'd', 'e', 'i', 'l', 'n', 'o', 'r', 's', 'ss', 't', 'u', 'y', 'z', 'ae', 'oe',
+				'A', 'C', 'D', 'E', 'L', 'N', 'O', 'R', 'S', 'T', 'U', 'Z', 'AE', 'OE'
+			);
 
 		return preg_replace($patterns, $replacements, $str);
 	}