diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-01-22 17:31:05 +0000 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-01-22 17:31:05 +0000 |
| commit | aa648fca75539448c1437092108e21d6a3dc542e (patch) | |
| tree | fed53fd5a704ec7433d82dfb08e8d56d471ca4b3 /lib/MDB2 | |
| parent | ca454f0228a9d915ac56ac41f65ee865a7141ddc (diff) | |
| parent | dd40b691eee34d313a5894afbc7ccf217968fd94 (diff) | |
| download | nextcloud-server-aa648fca75539448c1437092108e21d6a3dc542e.tar.gz nextcloud-server-aa648fca75539448c1437092108e21d6a3dc542e.zip | |
Merge branch 'master' into files_encryption
Conflicts:
apps/files_encryption/templates/settings.php
Diffstat (limited to 'lib/MDB2')
| -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. |