diff options
author | Frank Karlitschek <frank@owncloud.org> | 2012-12-22 15:22:09 -0800 |
---|---|---|
committer | Frank Karlitschek <frank@owncloud.org> | 2012-12-22 15:22:09 -0800 |
commit | 15da11effebc25bac17c14e1c8d50e13f51e0b5a (patch) | |
tree | 33d232a573523ab9e5bb4ab0f5f804c0051f5b35 | |
parent | 0656b4174728595139dff5265553fdc44015a912 (diff) | |
parent | 4265419bbd1bae1fb62e7f07b6ef46cd60d1325f (diff) | |
download | nextcloud-server-15da11effebc25bac17c14e1c8d50e13f51e0b5a.tar.gz nextcloud-server-15da11effebc25bac17c14e1c8d50e13f51e0b5a.zip |
Merge pull request #845 from owncloud/sqlite_error
Try to fix #836
-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. |