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

// Fix tryConnection and tryEncoding for MySQL

Browse Source
This commit is contained in:
rMalie
2011-09-07 09:44:20 +00:00
parent 2751e1a3d3
commit a187f8dbc4
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Db.php
+4 -6
View File
@@ -175,7 +175,7 @@ abstract class DbCore
}
if (!isset(self::$_instance[$idServer]))
self::$_instance[$idServer] = Db::newInstance(self::$_servers[$idServer]['server'], self::$_servers[$idServer]['user'], self::$_servers[$idServer]['password'], self::$_servers[$idServer]['database']);
self::$_instance[$idServer] = Db::factory(self::$_servers[$idServer]['server'], self::$_servers[$idServer]['user'], self::$_servers[$idServer]['password'], self::$_servers[$idServer]['database']);
return self::$_instance[$idServer];
}
@@ -190,7 +190,7 @@ abstract class DbCore
* @param bool $connect If false, don't connect in constructor
* @return Db
*/
public static function newInstance($server, $user, $password, $database, $connect = true)
public static function factory($server, $user, $password, $database, $connect = true)
{
$class = 'MySQL';
if (class_exists('mysqli', false))
@@ -509,8 +509,7 @@ abstract class DbCore
*/
static public function checkConnection($server, $user, $pwd, $db)
{
$instance = Db::newInstance($server, $user, $pwd, $db, false);
return $instance->tryConnection();
return Db::factory($server, $user, $pwd, $db, false)->tryConnection();
}
/**
@@ -526,8 +525,7 @@ abstract class DbCore
*/
static public function checkEncoding($server, $user, $pwd, $encoding = 'UTF8')
{
$instance = Db::newInstance($server, $user, $pwd, '', false);
return $instance->tryEncoding($encoding);
return Db::factory($server, $user, $pwd, '', false)->tryEncoding($encoding);
}
/**