diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-12-25 14:29:29 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-12-25 14:29:29 +0100 |
| commit | 7e36f730ecfe452681f44771b28d1d3c4a5535df (patch) | |
| tree | 578e604c170219151239e2da345d332b079ed920 /lib/MDB2 | |
| parent | bf05ff351faa693337107ed4a316e36e9aacd296 (diff) | |
| parent | 5d59ac07391841677e204958ea20be3fe05cd8ef (diff) | |
| download | nextcloud-server-7e36f730ecfe452681f44771b28d1d3c4a5535df.tar.gz nextcloud-server-7e36f730ecfe452681f44771b28d1d3c4a5535df.zip | |
merge master into filesystem
Diffstat (limited to 'lib/MDB2')
| -rw-r--r-- | lib/MDB2/Driver/sqlite3.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php index fa4c91c1269..9839dafbce1 100644 --- a/lib/MDB2/Driver/sqlite3.php +++ b/lib/MDB2/Driver/sqlite3.php @@ -98,8 +98,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common if ($this->connection) { $native_code = $this->connection->lastErrorCode(); } - $native_msg = $this->_lasterror - ? html_entity_decode($this->_lasterror) : $this->connection->lastErrorMsg(); + $native_msg = html_entity_decode($this->_lasterror); // PHP 5.2+ prepends the function name to $php_errormsg, so we need // this hack to work around it, per bug #9599. |