Changeset 8222 for sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php

Timestamp:

09/26/13 15:41:49 (11 years ago)

Author:

angelo

Message:

Ticket #3491 - Compatibilizar Expresso com novas versoes do PHP

File:

• sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php (modified) (10 diffs)

sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/drivers/adodb-ibase.inc.php

@@ -1 +1 @@
 <?php
 /*
-V4.94 23 Jan 2007  (c) 2000-2007 John Lim (jlim#natsoft.com.my). All rights reserved.  
+V5.18 3 Sep 2012  (c) 2000-2012 John Lim (jlim#natsoft.com). All rights reserved.  
   Released under both BSD license and Lesser GPL library license. 
   Whenever there is any discrepancy between the two licenses, 
@@ -160 +160 @@
         // there are some compat problems with ADODB_COUNTRECS=false and $this->_logsql currently.
         // it appears that ibase extension cannot support multiple concurrent queryid's
-        function &_Execute($sql,$inputarr=false) 
+        function _Execute($sql,$inputarr=false) 
         {
         global $ADODB_COUNTRECS;
@@ -167 +167 @@
                         $savecrecs = $ADODB_COUNTRECS;
                         $ADODB_COUNTRECS = true; // force countrecs
-                        $ret =& ADOConnection::_Execute($sql,$inputarr);
+                        $ret = ADOConnection::_Execute($sql,$inputarr);
                         $ADODB_COUNTRECS = $savecrecs;
                 } else {
-                        $ret =& ADOConnection::_Execute($sql,$inputarr);
+                        $ret = ADOConnection::_Execute($sql,$inputarr);
                 }
                 return $ret;
@@ -188 +188 @@
         }
         
-        function &MetaIndexes ($table, $primary = FALSE, $owner=false)
+        function MetaIndexes ($table, $primary = FALSE, $owner=false)
         {
         // save old fetch mode
@@ -243 +243 @@
         
         // See http://community.borland.com/article/0,1410,25844,00.html
-        function RowLock($tables,$where,$col)
+        function RowLock($tables,$where,$col=false)
         {
                 if ($this->autoCommit) $this->BeginTrans();
@@ -327 +327 @@
                                 if  (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
                                         if ( !isset($iarr[0]) ) $iarr[0] = ''; // PHP5 compat hack
-                                        $fnarr =& array_merge( array($sql) , $iarr);
+                                        $fnarr = array_merge( array($sql) , $iarr);
                                         $ret = call_user_func_array($fn,$fnarr);
                                 } else {
@@ -349 +349 @@
                                 if (ADODB_PHPVER >= 0x4050) { // actually 4.0.4
                                         if (sizeof($iarr) == 0) $iarr[0] = ''; // PHP5 compat hack
-                                        $fnarr =& array_merge( array($conn,$sql) , $iarr);
+                                        $fnarr = array_merge( array($conn,$sql) , $iarr);
                                         $ret = call_user_func_array($fn,$fnarr);
                                 } else {
@@ -477 +477 @@
         //OPN STUFF end
                 // returns array of ADOFieldObjects for current table
-        function &MetaColumns($table) 
+        function MetaColumns($table, $normalize=true) 
         {
         global $ADODB_FETCH_MODE;
@@ -744 +744 @@
                         fetchField() is retrieved.              */
 
-        function &FetchField($fieldOffset = -1)
+        function FetchField($fieldOffset = -1)
         {
                          $fld = new ADOFieldObject;
@@ -823 +823 @@
                 $this->fields = $f;
                 if ($this->fetchMode == ADODB_FETCH_ASSOC) {
-                        $this->fields = &$this->GetRowAssoc(ADODB_ASSOC_CASE);
+                        $this->fields = $this->GetRowAssoc(ADODB_ASSOC_CASE);
                 } else if ($this->fetchMode == ADODB_FETCH_BOTH) {
-                        $this->fields =& array_merge($this->fields,$this->GetRowAssoc(ADODB_ASSOC_CASE));
+                        $this->fields = array_merge($this->fields,$this->GetRowAssoc(ADODB_ASSOC_CASE));
                 }
                 return true;