mirror/php-dibi
1
0
Fork 0
mirror of https://github.com/dg/dibi.git synced 2025-08-06 14:16:39 +02:00
Code Issues Releases Wiki Activity

Merge pull request #128 from brablc/master

Browse Source 
Avoid error handler invocation
This commit is contained in:
David Grudl
2014-02-20 19:38:54 +01:00
parent 5082282e35 6666d71e5b
commit a6cc588d91
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dibi/dibi.php
View File

@@ -14,8 +14,9 @@ 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 @ if (get_magic_quotes_runtime()) {
set_magic_quotes_runtime(FALSE);
}
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';

2
dibi/drivers/DibiMySqliDriver.php
View File

@@ -458,7 +458,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;
} }
} }