summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorsvncommit <devs@roundcube.net>2009-09-13 02:11:32 +0000
committersvncommit <devs@roundcube.net>2009-09-13 02:11:32 +0000
commit0f6e0e1d429c9d570750f2c2e99f25f07c3ea376 (patch)
treeff395c5f77d806f411cf4f2dc37d8e904535d17c /program/lib
parentae119b9de765646b827b9b6fa29cb4eae7b17f46 (diff)
applied patch from PEAR bug #16508
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/MDB2.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/program/lib/MDB2.php b/program/lib/MDB2.php
index 45b20e3cb..762eb068a 100644
--- a/program/lib/MDB2.php
+++ b/program/lib/MDB2.php
@@ -389,7 +389,7 @@ class MDB2
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 @@ class MDB2_Driver_Common extends PEAR
*
* @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 @@ class MDB2_Driver_Common extends PEAR
'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 @@ function MDB2_defaultDebugOutput(&$db, $scope, $message, $context = array())
}
// }}}
-?> \ No newline at end of file
+?>