svncommit
2009-09-12 0f6e0e1d429c9d570750f2c2e99f25f07c3ea376
applied patch from PEAR bug #16508

1 files modified
10 ■■■■ changed files
program/lib/MDB2.php 10 ●●●● patch | view | raw | blame | history
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 @@
}
// }}}
?>
?>