com php-src: Merge branch 'PHP-5.6': ext/sqlite3/sqlite3.c
| From: | Xinchen Hui | Date: | Tue, 07 Jul 2015 13:38:24 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/sqlite3/sqlite3.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87792@lists.php.net to get a copy of this message | ||
Commit: ca1ba39102d3e209d4c8a04b46316e9c8b7521e4
Author: Xinchen Hui <laruence@php.net> Tue, 7 Jul 2015 21:38:24 +0800
Parents: 5bd315657c41601803bf5cf2528fdd373fdfdf48 26471eb69c3cd9e8162ff3b398d33919d9075191
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ca1ba39102d3e209d4c8a04b46316e9c8b7521e4
Log:
Merge branch 'PHP-5.6'
Conflicts:
ext/sqlite3/sqlite3.c
Changed paths:
MM ext/sqlite3/sqlite3.c
Diff:
diff --cc ext/sqlite3/sqlite3.c
index eacd663,16319a7..b16cba3
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@@ -299,7 -309,11 +303,11 @@@ PHP_METHOD(sqlite3, lastErrorMsg
return;
}
- RETVAL_STRING((char *)sqlite3_errmsg(db_obj->db));
+ if (db_obj->initialised) {
- RETURN_STRING((char *)sqlite3_errmsg(db_obj->db), 1);
++ RETURN_STRING((char *)sqlite3_errmsg(db_obj->db));
+ } else {
+ RETURN_EMPTY_STRING();
+ }
}
/* }}} */