applied patch from PEAR bug #16508

release-0.6
svncommit 15 years ago
parent ae119b9de7
commit 0f6e0e1d42

@ -389,7 +389,7 @@ class MDB2
return $err; return $err;
} }
$db =& new $class_name(); $db = new $class_name();
$db->setDSN($dsninfo); $db->setDSN($dsninfo);
$err = MDB2::setOptions($db, $options); $err = MDB2::setOptions($db, $options);
if (PEAR::isError($err)) { if (PEAR::isError($err)) {
@ -2580,13 +2580,13 @@ class MDB2_Driver_Common extends PEAR
* *
* @access protected * @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) $result_wrap_class = false, $limit = null, $offset = null)
{ {
if ($types === true) { if ($types === true) {
if ($this->supports('result_introspection')) { if ($this->supports('result_introspection')) {
$this->loadModule('Reverse', null, true); $this->loadModule('Reverse', null, true);
$tableInfo = $this->reverse->tableInfo($result); $tableInfo = $this->reverse->tableInfo($result_resource);
if (PEAR::isError($tableInfo)) { if (PEAR::isError($tableInfo)) {
return $tableInfo; return $tableInfo;
} }
@ -2611,7 +2611,7 @@ class MDB2_Driver_Common extends PEAR
'result class does not exist '.$class_name, __FUNCTION__); 'result class does not exist '.$class_name, __FUNCTION__);
return $err; return $err;
} }
$result =& new $class_name($this, $result, $limit, $offset); $result = new $class_name($this, $result_resource, $limit, $offset);
if (!MDB2::isResultCommon($result)) { if (!MDB2::isResultCommon($result)) {
$err =& $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null, $err =& $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
'result class is not extended from MDB2_Result_Common', __FUNCTION__); 'result class is not extended from MDB2_Result_Common', __FUNCTION__);
@ -4325,4 +4325,4 @@ function MDB2_defaultDebugOutput(&$db, $scope, $message, $context = array())
} }
// }}} // }}}
?> ?>

Loading…
Cancel
Save