// Add config/alias.php file + refactoring of DB / MySQL classes

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7668 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-20 16:10:12 +00:00
parent 42da42f827
commit e921117581
19 changed files with 494 additions and 474 deletions
@@ -86,7 +86,7 @@ class ContactControllerCore extends FrontController
 			$message = Tools::htmlentitiesUTF8(Tools::getValue('message'));
 			if (!($from = trim(Tools::getValue('from'))) OR !Validate::isEmail($from))
 				$this->errors[] = Tools::displayError('Invalid e-mail address');
-			elseif (!($message = nl2br2($message)))
+			elseif (!($message = Tools::nl2br($message)))
 				$this->errors[] = Tools::displayError('Message cannot be blank');
 			elseif (!Validate::isCleanHtml($message))
 				$this->errors[] = Tools::displayError('Invalid message');