diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-07-25 20:28:57 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-07-25 20:28:57 +0800 |
| commit | 088905bf602ba83c42ac822641ff6f359ba9ba3d (patch) | |
| tree | 153ed2e4190e7dc450b8171d00f8edd2849ac22a /ext/sqlite3/sqlite3.c | |
| parent | 0d5050225db58fdb3673feb15679c31882199808 (diff) | |
| parent | f5e56cf9707a1be547cc29f568d6f60dbdbb1e4c (diff) | |
| download | php-git-088905bf602ba83c42ac822641ff6f359ba9ba3d.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72668 (Spurious warning when exception is thrown in user defined function)
Diffstat (limited to 'ext/sqlite3/sqlite3.c')
| -rw-r--r-- | ext/sqlite3/sqlite3.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index 201c683b4f..96b1dd2178 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -660,8 +660,10 @@ PHP_METHOD(sqlite3, querySingle) break; } default: + if (!EG(exception)) { php_sqlite3_error(db_obj, "Unable to execute statement: %s", sqlite3_errmsg(db_obj->db)); - RETVAL_FALSE; + } + RETVAL_FALSE; } sqlite3_finalize(stmt); } |