extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

"- removed unneeded stripslashes while reading the configuration, as it \"eats\" the backslashed of windows pathes (eg. messes up the default cache path)

Browse Source 
- replaced depricated fetchSingle() with fetchColumn()"
This commit is contained in:
Ralf Becker 2009-04-28 19:32:29 +00:00
parent e50f35cbad
commit a1c7c87195
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpgwapi/inc/class.egw.inc.php
View File

@ -86,9 +86,9 @@ class egw extends egw_minimal
// check if eGW is already setup, if not redirect to setup/ // check if eGW is already setup, if not redirect to setup/
try { try {
$this->db->connect(); $this->db->connect();
if (!($num_config = $this->db->select(config::TABLE,'COUNT(config_name)',false,__LINE__,__FILE__)->fetchSingle())) if (!($num_config = $this->db->select(config::TABLE,'COUNT(config_name)',false,__LINE__,__FILE__)->fetchColumn()))
{ {
$phpgw_config = $this->db->select('phpgw_config','COUNT(config_name)',false,__LINE__,__FILE__)->fetchSingle(); $phpgw_config = $this->db->select('phpgw_config','COUNT(config_name)',false,__LINE__,__FILE__)->fetchColumn();
} }
} }
catch(Exception $e) { catch(Exception $e) {
@ -115,7 +115,7 @@ class egw extends egw_minimal
$system_charset = $this->db->select(config::TABLE,'config_value',array( $system_charset = $this->db->select(config::TABLE,'config_value',array(
'config_app' => 'phpgwapi', 'config_app' => 'phpgwapi',
'config_name' => 'system_charset', 'config_name' => 'system_charset',
),__LINE__,__FILE__)->fetchSingle(); ),__LINE__,__FILE__)->fetchColumn();
if ($system_charset) if ($system_charset)
{ {
$this->db->Link_ID->SetCharSet($system_charset); $this->db->Link_ID->SetCharSet($system_charset);
@ -123,7 +123,7 @@ class egw extends egw_minimal
// load up the $GLOBALS['egw_info']['server'] array // load up the $GLOBALS['egw_info']['server'] array
foreach($this->db->select(config::TABLE,'*',array('config_app' => 'phpgwapi'),__LINE__,__FILE__) as $row) foreach($this->db->select(config::TABLE,'*',array('config_app' => 'phpgwapi'),__LINE__,__FILE__) as $row)
{ {
$GLOBALS['egw_info']['server'][$row['config_name']] = stripslashes($row['config_value']); $GLOBALS['egw_info']['server'][$row['config_name']] = $row['config_value'];
} }
//$GLOBALS['egw_info']['server'] = config::read('phpgwapi'); would unserialize arrays //$GLOBALS['egw_info']['server'] = config::read('phpgwapi'); would unserialize arrays