// REVERT MERGE

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-27 13:35:06 +00:00
parent e159c925d8
commit be4811aa6e
182 changed files with 1335 additions and 6181 deletions
+3 -9
View File
@@ -28,15 +28,9 @@ class ToolsInstall
{
public static function checkDB ($srv, $login, $password, $name, $posted = true, $engine = false)
{
// Don't include theses files if classes are already defined
if (!class_exists('Validate', false))
include_once(INSTALL_PATH.'/../classes/Validate.php');
if (!class_exists('Db', false))
include_once(INSTALL_PATH.'/../classes/Db.php');
if (!class_exists('MySQL', false))
include_once(INSTALL_PATH.'/../classes/MySQL.php');
include_once(INSTALL_PATH.'/../classes/Validate.php');
include_once(INSTALL_PATH.'/../classes/Db.php');
include_once(INSTALL_PATH.'/../classes/MySQL.php');
if($posted)
{