Changeset 8235 for sandbox/2.5.1-evolucao/phpgwapi/inc/class.db.inc.php

Timestamp:

10/10/13 11:39:53 (11 years ago)

Author:

angelo

Message:

Ticket #3491 - Compatibilizar Expresso com novas versoes do PHP

File:

• sandbox/2.5.1-evolucao/phpgwapi/inc/class.db.inc.php (modified) (2 diffs)

sandbox/2.5.1-evolucao/phpgwapi/inc/class.db.inc.php

@@ -209 +209 @@
                                         $GLOBALS[ 'phpgw' ]->ADOdb = NULL;
                                 }
-                                if (!is_object($GLOBALS['phpgw']->ADOdb) ||     // we have no connection so far
+                                if (!isset($GLOBALS[ 'phpgw' ]->ADOdb) /*!is_object($GLOBALS['phpgw']->ADOdb)*/ ||      // we have no connection so far
                                         (isset($GLOBALS['phpgw']->db) && is_object($GLOBALS['phpgw']->db) &&    // we connect to a different db, then the global one
                                                 ($this->Type != $GLOBALS['phpgw']->db->Type ||
@@ -217 +217 @@
                                                 $this->Port != $GLOBALS['phpgw']->db->Port)))
                                 {
-                                        if (!is_object($GLOBALS['phpgw']->ADOdb))       // use the global object to store the connection
+                                        if (isset($GLOBALS[ 'phpgw' ]->ADOdb)/*!is_object($GLOBALS['phpgw']->ADOdb)*/)  // use the global object to store the connection
                                         {
                                                 $this->Link_ID = &$GLOBALS['phpgw']->ADOdb;