mirror of
https://github.com/dg/dibi.git
synced 2025-02-24 02:43:09 +01:00
Avoid error handler invocation
This commit is contained in:
parent
5082282e35
commit
6666d71e5b
@ -14,8 +14,9 @@ if (version_compare(PHP_VERSION, '5.2.0', '<')) {
|
||||
throw new Exception('dibi needs PHP 5.2.0 or newer.');
|
||||
}
|
||||
|
||||
@set_magic_quotes_runtime(FALSE); // intentionally @
|
||||
|
||||
if (get_magic_quotes_runtime()) {
|
||||
set_magic_quotes_runtime(FALSE);
|
||||
}
|
||||
|
||||
require_once dirname(__FILE__) . '/libs/interfaces.php';
|
||||
require_once dirname(__FILE__) . '/libs/DibiDateTime.php';
|
||||
|
@ -458,7 +458,7 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
|
||||
public function getResultResource()
|
||||
{
|
||||
$this->autoFree = FALSE;
|
||||
return @$this->resultSet->type === NULL ? NULL : $this->resultSet;
|
||||
return $this->resultSet === NULL || $this->resultSet->type === NULL ? NULL : $this->resultSet;
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user