From e89917f86058f9327cb11f92732af1c049b0a752 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 27 Jun 2008 09:40:32 +0000 Subject: [PATCH] reverting my last commit, as it breaks app update/install in setup --- phpgwapi/inc/class.egw_db.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php index 5fc3dc1d6b..d0d6bfce18 100644 --- a/phpgwapi/inc/class.egw_db.inc.php +++ b/phpgwapi/inc/class.egw_db.inc.php @@ -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; }