Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests 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 9200847eaa
commit 2a19e9d2a1
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;