// 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
This commit is contained in:
rMalie
2011-07-20 16:10:12 +00:00
parent 42da42f827
commit e921117581
19 changed files with 494 additions and 474 deletions
+11 -1
View File
@@ -2094,7 +2094,17 @@ FileETag INode MTime Size
public static function url($begin, $end)
{
return $begin.((strpos($begin, '?') !== false) ? '&' : '?').$end;
}
/**
* Convert \n and \r\n and \r to <br />
*
* @param string $string String to transform
* @return string New string
*/
public static function nl2br($str)
{
return str_replace(array("\r\n", "\r", "\n"), '<br />', $str);
}
}