Changeset 8222 for sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/drivers/adodb-oracle.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-oracle.inc.php (modified) (5 diffs)

sandbox/2.5.1-evolucao/phpgwapi/inc/adodb/drivers/adodb-oracle.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, 
@@ -36 +36 @@
         {
                 if (is_string($d)) $d = ADORecordSet::UnixDate($d);
-                return 'TO_DATE('.adodb_date($this->fmtDate,$d).",'YYYY-MM-DD')";
+                if (is_object($d)) $ds = $d->format($this->fmtDate);
+                else $ds = adodb_date($this->fmtDate,$d);
+                return 'TO_DATE('.$ds.",'YYYY-MM-DD')";
         }
         
@@ -43 +45 @@
         {
 
-                if (is_string($ts)) $d = ADORecordSet::UnixTimeStamp($ts);
-                return 'TO_DATE('.adodb_date($this->fmtTimeStamp,$ts).",'RRRR-MM-DD, HH:MI:SS AM')";
+                if (is_string($ts)) $ts = ADORecordSet::UnixTimeStamp($ts);
+                if (is_object($ts)) $ds = $ts->format($this->fmtDate);
+                else $ds = adodb_date($this->fmtTimeStamp,$ts);
+                return 'TO_DATE('.$ds.",'RRRR-MM-DD, HH:MI:SS AM')";
         }
         
@@ -249 +253 @@
                            fetchField() is retrieved.           */
 
-           function &FetchField($fieldOffset = -1)
+           function FetchField($fieldOffset = -1)
            {
                         $fld = new ADOFieldObject;
@@ -287 +291 @@
 // should remove call by reference, but ora_fetch_into requires it in 4.0.3pl1
                 if ($this->fetchMode & ADODB_FETCH_ASSOC)
-                        return @ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
+                        return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS|ORA_FETCHINTO_ASSOC);
                 else 
-                        return @ora_fetch_into($this->_queryID,&$this->fields,ORA_FETCHINTO_NULLS);
+                        return @ora_fetch_into($this->_queryID,$this->fields,ORA_FETCHINTO_NULLS);
    }