lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Var can't be static

Browse Source
This commit is contained in:
Laurent Destailleur 2012-04-28 18:04:55 +02:00
parent 5e252bcb04
commit 7b5aedeb3e
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/db/mssql.class.php
View File

@ -38,9 +38,9 @@ class DoliDBMssql
//! Database label
static $label='MSSQL';
//! Charset used to force charset when creating database
static $forcecharset='latin1';
var $forcecharset='latin1'; // Can't be static as it may be forced with a dynamic value
//! Collate used to force collate when creating database
static $forcecollate='latin1_swedish_ci';
var $forcecollate='latin1_swedish_ci'; // Can't be static as it may be forced with a dynamic value
//! Version min database
static $versionmin=array(2000);
//! Resultset of last request

4
htdocs/core/db/mysql.class.php
View File

@ -38,9 +38,9 @@ class DoliDBMysql
//! Database label
static $label='MySQL';
//! Charset used to force charset when creating database
static $forcecharset='utf8'; // latin1, utf8
var $forcecharset='utf8'; // latin1, utf8. Can't be static as it may be forced with a dynamic value
//! Collate used to force collate when creating database
static $forcecollate='utf8_general_ci'; // latin1_swedish_ci, utf8_general_ci
var $forcecollate='utf8_general_ci'; // latin1_swedish_ci, utf8_general_ci. Can't be static as it may be forced with a dynamic value
//! Version min database
static $versionmin=array(4,1,0);
//! Resultset of last request

6
htdocs/core/db/mysqli.class.php
View File

@ -38,9 +38,9 @@ class DoliDBMysqli
//! Database label
static $label='MySQL';
//! Charset used to force charset when creating database
static $forcecharset='utf8'; // latin1, utf8
var $forcecharset='utf8'; // latin1, utf8. Can't be static as it may be forced with a dynamic value
//! Collate used to force collate when creating database
static $forcecollate='utf8_general_ci'; // latin1_swedish_ci, utf8_general_ci
var $forcecollate='utf8_general_ci'; // latin1_swedish_ci, utf8_general_ci. Can't be static as it may be forced with a dynamic value
//! Version min database
static $versionmin=array(4,1,0);
//! Resultset of last request
@ -83,7 +83,7 @@ class DoliDBMysqli
function DoliDBMysqli($type, $host, $user, $pass, $name='', $port=0)
{
global $conf,$langs;
// TODO error in strict mode (static property for "$forcecharset" and "$forcecollate")
//if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
//if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;

7
htdocs/core/db/pgsql.class.php
View File

@ -40,7 +40,7 @@ class DoliDBPgsql
//! Database label
static $label='PostgreSQL'; // Label of manager
//! Charset
static $forcecharset='latin1';
var $forcecharset='latin1'; // Can't be static as it may be forced with a dynamic value
//! Version min database
static $versionmin=array(8,4,0); // Version min database
@ -81,8 +81,9 @@ class DoliDBPgsql
{
global $conf,$langs;
$this->forcecharset=$conf->file->character_set_client;
$this->forcecollate=$conf->db->dolibarr_main_db_collation;
if (! empty($conf->db->character_set)) $this->forcecharset=$conf->db->character_set;
if (! empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate=$conf->db->dolibarr_main_db_collation;
$this->database_user=$user;
$this->transaction_opened=0;

4
htdocs/core/db/sqlite.class.php
View File

@ -38,9 +38,9 @@ class DoliDBSqlite
//! Database label
static $label='PDO Sqlite';
//! Charset used to force charset when creating database
static $forcecharset='utf8'; // latin1, utf8
var $forcecharset='utf8'; // latin1, utf8. Can't be static as it may be forced with a dynamic value
//! Collate used to force collate when creating database
static $forcecollate='utf8_general_ci'; // latin1_swedish_ci, utf8_general_ci
var $forcecollate='utf8_general_ci'; // latin1_swedish_ci, utf8_general_ci. Can't be static as it may be forced with a dynamic value
//! Version min database
static $versionmin=array(3,0,0);
//! Resultset of last request