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

reverting my last commit, as it breaks app update/install in setup

Browse Source
This commit is contained in:
Ralf Becker 2008-06-27 09:40:32 +00:00
parent f82bdd9492
commit e89917f860
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpgwapi/inc/class.egw_db.inc.php
View File

@ -365,7 +365,7 @@ class egw_db
if ($this->Port) $Host .= ':'.$this->Port;
break;
}
if (!isset($GLOBALS['egw']->ADOdb) || // we have no connection so far
if (!is_object($GLOBALS['egw']->ADOdb) || // we have no connection so far
(is_object($GLOBALS['egw']->db) && // we connect to a different db, then the global one
($this->Type != $GLOBALS['egw']->db->Type ||
$this->Database != $GLOBALS['egw']->db->Database ||
@ -379,7 +379,7 @@ class egw_db
$this->halt("Necessary php database support for $this->Type (".PHP_SHLIB_PREFIX.$php_extension.'.'.PHP_SHLIB_SUFFIX.") not loaded and can't be loaded, exiting !!!");
return null; // in case error-reporting = 'no'
}
if (!isset($GLOBALS['egw']->ADOdb)) // use the global object to store the connection
if (!is_object($GLOBALS['egw']->ADOdb)) // use the global object to store the connection
{
$this->Link_ID = $GLOBALS['egw']->ADOdb;
}