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

Timestamp:

10/14/13 17:18:20 (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

@@ -1008 +1008 @@
                         if (!$column_definitions)
                         {
-                                $column_definitions = $this->column_definitions;
+                                $column_definitions = isset($this->column_definitions) ? $this->column_definitions : NULL;
                         }
                         if ($this->Debug) echo "<p>db::column_data_implode('$glue',".print_r($array,True).",'$use_key',".print_r($only,True).",<pre>".print_r($column_definitions,True)."</pre>\n";
@@ -1077 +1077 @@
                         if (!$app)
                         {
-                                $app = $this->app ? $this->app : $GLOBALS['phpgw_info']['flags']['currentapp'];
+                                $app = isset($this->app) && $this->app  ? $this->app : $GLOBALS['phpgw_info']['flags']['currentapp'];
                         }
                         if (isset($GLOBALS['phpgw_info']['apps']))      // dont set it, if it does not exist!!!