1
0
mirror of https://github.com/dg/dibi.git synced 2025-08-04 21:28:02 +02:00

Avoid error handler invocation

This commit is contained in:
Ondrej Brablc
2014-02-20 18:47:35 +01:00
committed by David Grudl
parent fa5b7678f4
commit d75e605645
2 changed files with 1 additions and 3 deletions

View File

@@ -14,8 +14,6 @@ if (version_compare(PHP_VERSION, '5.2.0', '<')) {
throw new Exception('dibi needs PHP 5.2.0 or newer.'); throw new Exception('dibi needs PHP 5.2.0 or newer.');
} }
@set_magic_quotes_runtime(FALSE); // intentionally @
require_once dirname(__FILE__) . '/libs/interfaces.php'; require_once dirname(__FILE__) . '/libs/interfaces.php';
require_once dirname(__FILE__) . '/libs/DibiDateTime.php'; require_once dirname(__FILE__) . '/libs/DibiDateTime.php';

View File

@@ -457,7 +457,7 @@ class DibiMySqliDriver extends DibiObject implements IDibiDriver, IDibiResultDri
public function getResultResource() public function getResultResource()
{ {
$this->autoFree = FALSE; $this->autoFree = FALSE;
return @$this->resultSet->type === NULL ? NULL : $this->resultSet; return $this->resultSet === NULL || $this->resultSet->type === NULL ? NULL : $this->resultSet;
} }
} }