Merge pull request #845 from owncloud/sqlite_error

Try to fix #836
This commit is contained in:
Frank Karlitschek 2012-12-22 15:22:09 -08:00
commit 15da11effe

View file

@ -98,8 +98,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
if ($this->connection) { if ($this->connection) {
$native_code = $this->connection->lastErrorCode(); $native_code = $this->connection->lastErrorCode();
} }
$native_msg = $this->_lasterror $native_msg = html_entity_decode($this->_lasterror);
? html_entity_decode($this->_lasterror) : $this->connection->lastErrorMsg();
// PHP 5.2+ prepends the function name to $php_errormsg, so we need // PHP 5.2+ prepends the function name to $php_errormsg, so we need
// this hack to work around it, per bug #9599. // this hack to work around it, per bug #9599.