[Svn] r2950 - trunk/roundcubemail/program/lib

trac at roundcube.net trac at roundcube.net
Sun Sep 13 04:11:33 CEST 2009


Author: estadtherr
Date: 2009-09-12 21:11:32 -0500 (Sat, 12 Sep 2009)
New Revision: 2950

Modified:
   trunk/roundcubemail/program/lib/MDB2.php
Log:
applied patch from PEAR bug #16508

Modified: trunk/roundcubemail/program/lib/MDB2.php
===================================================================
--- trunk/roundcubemail/program/lib/MDB2.php	2009-09-12 13:39:24 UTC (rev 2949)
+++ trunk/roundcubemail/program/lib/MDB2.php	2009-09-13 02:11:32 UTC (rev 2950)
@@ -389,7 +389,7 @@
             return $err;
         }
 
-        $db =& new $class_name();
+        $db = new $class_name();
         $db->setDSN($dsninfo);
         $err = MDB2::setOptions($db, $options);
         if (PEAR::isError($err)) {
@@ -2580,13 +2580,13 @@
      *
      * @access  protected
      */
-    function &_wrapResult($result, $types = array(), $result_class = true,
+    function &_wrapResult($result_resource, $types = array(), $result_class = true,
         $result_wrap_class = false, $limit = null, $offset = null)
     {
         if ($types === true) {
             if ($this->supports('result_introspection')) {
                 $this->loadModule('Reverse', null, true);
-                $tableInfo = $this->reverse->tableInfo($result);
+                $tableInfo = $this->reverse->tableInfo($result_resource);
                 if (PEAR::isError($tableInfo)) {
                     return $tableInfo;
                 }
@@ -2611,7 +2611,7 @@
                     'result class does not exist '.$class_name, __FUNCTION__);
                 return $err;
             }
-            $result =& new $class_name($this, $result, $limit, $offset);
+            $result = new $class_name($this, $result_resource, $limit, $offset);
             if (!MDB2::isResultCommon($result)) {
                 $err =& $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
                     'result class is not extended from MDB2_Result_Common', __FUNCTION__);
@@ -4326,4 +4326,4 @@
 }
 
 // }}}
-?>
\ No newline at end of file
+?>

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list