holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"fix for error in setup-cli: egw_minimal::__get: There's NO ADOdb object!"

Browse Source
This commit is contained in:
Ralf Becker 2008-06-26 20:27:18 +00:00
parent b3b53c2f87
commit f82bdd9492
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_db.inc.php
View File

@ -365,7 +365,7 @@ class egw_db
if ($this->Port) $Host .= ':'.$this->Port;
break;
}
if (!is_object($GLOBALS['egw']->ADOdb) || // we have no connection so far
if (!isset($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,9 +379,9 @@ 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 (!is_object($GLOBALS['egw']->ADOdb)) // use the global object to store the connection
if (!isset($GLOBALS['egw']->ADOdb)) // use the global object to store the connection
{
$this->Link_ID = &$GLOBALS['egw']->ADOdb;
$this->Link_ID = $GLOBALS['egw']->ADOdb;
}
else
{
@ -429,7 +429,7 @@ class egw_db
}
else
{
$this->Link_ID = &$GLOBALS['egw']->ADOdb;
$this->Link_ID = $GLOBALS['egw']->ADOdb;
}
}
// next ADOdb version: if (!$this->Link_ID->isConnected()) $this->Link_ID->Connect();