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

[-) CORE : Remove undefined constant in class declaration

Browse Source
This commit is contained in:
gRoussac
2013-07-01 19:17:54 +02:00
parent 41219ad258
commit 508cc0bd1a
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/db/Db.php
Regular → Executable
+10 -6
View File
@@ -79,12 +79,7 @@ abstract class DbCore
/** /**
* @var array Object instance for singleton * @var array Object instance for singleton
*/ */
protected static $_servers = array( protected static $_servers = array();
array('server' => _DB_SERVER_, 'user' => _DB_USER_, 'password' => _DB_PASSWD_, 'database' => _DB_NAME_), /* MySQL Master server */
// Add here your slave(s) server(s)
// array('server' => '192.168.0.15', 'user' => 'rep', 'password' => '123456', 'database' => 'rep'),
// array('server' => '192.168.0.3', 'user' => 'myuser', 'password' => 'mypassword', 'database' => 'mydatabase'),
);
/** /**
* Store last executed query * Store last executed query
@@ -182,6 +177,15 @@ abstract class DbCore
{ {
static $id = 0; static $id = 0;
// This MUST not be declared with the class members because some defines (like _DB_SERVER_) may not exist yet (the constructor can be called directly with params)
if (!self::$_servers)
self::$_servers = array(
array('server' => _DB_SERVER_, 'user' => _DB_USER_, 'password' => _DB_PASSWD_, 'database' => _DB_NAME_), /* MySQL Master server */
// Add here your slave(s) server(s)
// array('server' => '192.168.0.15', 'user' => 'rep', 'password' => '123456', 'database' => 'rep'),
// array('server' => '192.168.0.3', 'user' => 'myuser', 'password' => 'mypassword', 'database' => 'mydatabase'),
);
$total_servers = count(self::$_servers); $total_servers = count(self::$_servers);
if ($master || $total_servers == 1) if ($master || $total_servers == 1)
$id_server = 0; $id_server = 0;