Index: DB.php =================================================================== RCS file: /repository/pear/DB/DB.php,v retrieving revision 1.25 diff -u -r1.25 DB.php --- DB.php 9 Oct 2003 10:12:31 -0000 1.25 +++ DB.php 12 Nov 2003 01:38:44 -0000 @@ -219,8 +219,9 @@ $classname = "DB_${type}"; if (!class_exists($classname)) { - return PEAR::raiseError(null, DB_ERROR_NOT_FOUND, + $tmp = PEAR::raiseError(null, DB_ERROR_NOT_FOUND, null, null, null, 'DB_Error', true); + return $tmp; } @$obj =& new $classname; @@ -270,9 +271,11 @@ $classname = "DB_${type}"; if (!class_exists($classname)) { - return PEAR::raiseError(null, DB_ERROR_NOT_FOUND, null, null, - "Unable to include the DB/{$type}.php file for `$dsn'", + $tmp = PEAR::raiseError(null, DB_ERROR_NOT_FOUND, null, null, + "Unable to include the DB/{$type}.php " + . "file for `$dsn'", 'DB_Error', true); + return $tmp; } @$obj =& new $classname; @@ -734,7 +737,8 @@ if ($this->autofree) { $this->free(); } - return null; + $tmp = null; + return $tmp; } if ($this->limit_type == 'emulate') { $rownum = $this->row_counter; Index: DB/common.php =================================================================== RCS file: /repository/pear/DB/DB/common.php,v retrieving revision 1.26 diff -u -r1.26 common.php --- DB/common.php 1 Oct 2003 16:48:49 -0000 1.26 +++ DB/common.php 12 Nov 2003 01:38:45 -0000 @@ -290,7 +290,9 @@ $mode = $this->_default_error_mode; $options = $this->_default_error_options; } - return PEAR::raiseError($code, null, $mode, $options, null, null, true); + $tmp = PEAR::raiseError($code, null, $mode, $options, null, + null, true); + return $tmp; } if ($userinfo === null) { @@ -301,8 +303,9 @@ $userinfo .= " [nativecode=$nativecode]"; } - return PEAR::raiseError(null, $code, $mode, $options, $userinfo, + $tmp = PEAR::raiseError(null, $code, $mode, $options, $userinfo, 'DB_Error', true); + return $tmp; } // }}} @@ -572,7 +575,8 @@ if (DB::isError($result) || $result === DB_OK) { return $result; } else { - return new DB_result($this, $result); + $result = new DB_result($this, $result); + return $result; } } @@ -770,7 +774,8 @@ if (DB::isError($result) || $result === DB_OK) { return $result; } else { - return new DB_result($this, $result); + $result = new DB_result($this, $result); + return $result; } } } @@ -1066,7 +1071,8 @@ $cols = $res->numCols(); if ($cols < 2) { - return $this->raiseError(DB_ERROR_TRUNCATED); + $res = $this->raiseError(DB_ERROR_TRUNCATED); + return $res; } $results = array(); Index: DB/dbase.php =================================================================== RCS file: /repository/pear/DB/DB/dbase.php,v retrieving revision 1.5 diff -u -r1.5 dbase.php --- DB/dbase.php 18 Sep 2003 19:29:46 -0000 1.5 +++ DB/dbase.php 12 Nov 2003 01:38:45 -0000 @@ -107,7 +107,8 @@ { // emulate result resources $this->res_row[$this->result] = 0; - return new DB_result($this, $this->result++); + $tmp = new DB_result($this, $this->result++); + return $tmp; } // }}} Index: DB/ibase.php =================================================================== RCS file: /repository/pear/DB/DB/ibase.php,v retrieving revision 1.15 diff -u -r1.15 ibase.php --- DB/ibase.php 18 Sep 2003 19:29:46 -0000 1.15 +++ DB/ibase.php 12 Nov 2003 01:38:46 -0000 @@ -347,16 +347,19 @@ } $res = call_user_func_array('ibase_execute', $pdata); if (!$res) { - return $this->ibaseRaiseError(); + $res = $this->ibaseRaiseError(); + return &res; } /* XXX need this? if ($this->autocommit && $this->manip_query[(int)$stmt]) { ibase_commit($this->connection); }*/ if ($this->manip_query[(int)$stmt]) { - return DB_OK; + $res = DB_OK; + return $res; } else { - return new DB_result($this, $res); + $res = new DB_result($this, $res); + return $res; } } Index: DB/oci8.php =================================================================== RCS file: /repository/pear/DB/DB/oci8.php,v retrieving revision 1.15 diff -u -r1.15 oci8.php --- DB/oci8.php 7 Oct 2003 13:57:37 -0000 1.15 +++ DB/oci8.php 12 Nov 2003 01:38:46 -0000 @@ -374,7 +374,8 @@ { $types=&$this->prepare_types[$stmt]; if (($size = sizeof($types)) != sizeof($data)) { - return $this->raiseError(DB_ERROR_MISMATCH); + $tmp = $this->raiseError(DB_ERROR_MISMATCH); + return $tmp; } for ($i = 0; $i < $size; $i++) { if (is_array($data)) { @@ -394,7 +395,8 @@ } } if (!@OCIBindByName($stmt, ":bind" . $i, $pdata[$i], -1)) { - return $this->oci8RaiseError($stmt); + $tmp = $this->oci8RaiseError($stmt); + return $tmp; } } if ($this->autoCommit) { @@ -403,13 +405,16 @@ $success = @OCIExecute($stmt, OCI_DEFAULT); } if (!$success) { - return $this->oci8RaiseError($stmt); + $success = $this->oci8RaiseError($stmt); + return $success; } $this->last_stmt = $stmt; if ($this->manip_query[(int)$stmt]) { - return DB_OK; + $tmp = DB_OK; + return $tmp; } else { - return new DB_result($this, $stmt); + $tmp = new DB_result($this, $stmt); + return $tmp; } } Index: DB/storage.php =================================================================== RCS file: /repository/pear/DB/DB/storage.php,v retrieving revision 1.7 diff -u -r1.7 storage.php --- DB/storage.php 29 Sep 2003 12:10:18 -0000 1.7 +++ DB/storage.php 12 Nov 2003 01:38:47 -0000 @@ -409,7 +409,8 @@ if (isset($this->_properties[$property])) { return $this->$property; } - return null; + $property = null; + return $property; } // }}}