From 0f6e0e1d429c9d570750f2c2e99f25f07c3ea376 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Sat, 12 Sep 2009 22:11:32 -0400
Subject: [PATCH] applied patch from PEAR bug #16508
---
program/lib/MDB2.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/program/lib/MDB2.php b/program/lib/MDB2.php
index 45b20e3..762eb06 100644
--- a/program/lib/MDB2.php
+++ b/program/lib/MDB2.php
@@ -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__);
@@ -4325,4 +4325,4 @@
}
// }}}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1