diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php index 9067effca1d..5c4439bd083 100644 --- a/htdocs/core/db/mssql.class.php +++ b/htdocs/core/db/mssql.class.php @@ -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 diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php index d8f18d2971c..cd295d68cc2 100644 --- a/htdocs/core/db/mysql.class.php +++ b/htdocs/core/db/mysql.class.php @@ -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 diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php index 3fbda6c3613..6b82861d1f7 100644 --- a/htdocs/core/db/mysqli.class.php +++ b/htdocs/core/db/mysqli.class.php @@ -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; diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php index beff42d7840..fa0a3b0eef4 100644 --- a/htdocs/core/db/pgsql.class.php +++ b/htdocs/core/db/pgsql.class.php @@ -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; diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php index 06d1a460976..673d5c1d4e7 100644 --- a/htdocs/core/db/sqlite.class.php +++ b/htdocs/core/db/sqlite.class.php @@ -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