dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// MERGE with 1.4 r7770

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/classes/ToolsInstall.php
+18 -2
View File
@@ -26,10 +26,26 @@
*/
class ToolsInstall
{
public static function checkDB ($srv, $login, $password, $name, $posted = true, $engine = false)
/**
* checkDB will call to the
*
* @param string $srv
* @param string $login
* @param string $password
* @param string $name
* @param string $posted
* @return void
*/
public static function checkDB ($srv, $login, $password, $name, $posted = true)
{
// 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');
if($posted)
@@ -51,7 +67,7 @@ class ToolsInstall
return 8;
}
switch(MySQL::tryToConnect(trim($srv), trim($login), trim($password), trim($name), trim($engine)))
switch(MySQL::tryToConnect(trim($srv), trim($login), trim($password), trim($name)))
{
case 0:
if (MySQL::tryUTF8(trim($srv), trim($login), trim($password)))