diff options
author | Robin Appelman <icewind@owncloud.com> | 2013-01-16 19:04:50 +0100 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2013-01-16 19:04:50 +0100 |
commit | 5445b94416f50bb040e7426cadfa458607893f07 (patch) | |
tree | 337b12362333030e0ebda37acb7f25073723a7af /lib/MDB2/Driver/sqlite3.php | |
parent | 7debfac0dc8f602168d8db480cfd4757b4d612b0 (diff) | |
parent | 1d57a2e2a9d5e392bb1061479543cd1dec860c4b (diff) | |
download | nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.tar.gz nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.zip |
merge master into filesystem
Diffstat (limited to 'lib/MDB2/Driver/sqlite3.php')
-rw-r--r-- | lib/MDB2/Driver/sqlite3.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php index 9839dafbce1..8f057cfb6e8 100644 --- a/lib/MDB2/Driver/sqlite3.php +++ b/lib/MDB2/Driver/sqlite3.php @@ -98,7 +98,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common if ($this->connection) { $native_code = $this->connection->lastErrorCode(); } - $native_msg = html_entity_decode($this->_lasterror); + $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. |