Updates DB.php to v1.7.14

This commit is contained in:
nikolark committed 2012-04-09 14:02:13 +02:00
1 parent 295ac6a063
commit e1425e2f45
16 files changed
+833 -360

No files matched your search

+6 -6
View File
@@ -18,9 +18,9 @@
* @package DB
* @author Stig Bakken <ssb@php.net>
* @author Daniel Convissor <danielc@php.net>
* @copyright 1997-2005 The PHP Group
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
* @version CVS: $Id: odbc.php,v 1.78 2005/02/28 01:42:17 danielc Exp $
* @version CVS: $Id: odbc.php 239211 2007-07-06 05:19:21Z aharvey $
* @link http://pear.php.net/package/DB
*/
@@ -42,9 +42,9 @@ require_once 'DB/common.php';
* @package DB
* @author Stig Bakken <ssb@php.net>
* @author Daniel Convissor <danielc@php.net>
* @copyright 1997-2005 The PHP Group
* @copyright 1997-2007 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
* @version Release: 1.7.6
* @version Release: 1.7.14
* @link http://pear.php.net/package/DB
*/
class DB_odbc extends DB_common
@@ -266,7 +266,7 @@ class DB_odbc extends DB_common
}
// Determine which queries that should return data, and which
// should return an error code only.
if (DB::isManip($query)) {
if ($this->_checkManip($query)) {
$this->affected = $result; // For affectedRows()
return DB_OK;
}
@@ -367,7 +367,7 @@ class DB_odbc extends DB_common
*/
function freeResult($result)
{
return @odbc_free_result($result);
return is_resource($result) ? odbc_free_result($result) : false;
}
// }}}