diff options
| author | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-01-20 05:12:38 +0000 |
|---|---|---|
| committer | Ludovic Arnaud <ludovic_arnaud@users.sourceforge.net> | 2003-01-20 05:12:38 +0000 |
| commit | 458b9b50ec8d835b4c5f72823d4815a9cee6d706 (patch) | |
| tree | ab0ea84c5e34cb6b5fa61b736e89722a92395c16 /phpBB/db/mysql.php | |
| parent | b2721cca0c82400efbf23abca1cbe260d4ea0eea (diff) | |
| download | forums-458b9b50ec8d835b4c5f72823d4815a9cee6d706.tar forums-458b9b50ec8d835b4c5f72823d4815a9cee6d706.tar.gz forums-458b9b50ec8d835b4c5f72823d4815a9cee6d706.tar.bz2 forums-458b9b50ec8d835b4c5f72823d4815a9cee6d706.tar.xz forums-458b9b50ec8d835b4c5f72823d4815a9cee6d706.zip | |
Un-b0rked ACL options caching, small general fixes
git-svn-id: file:///svn/phpbb/trunk@3338 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/db/mysql.php')
| -rw-r--r-- | phpBB/db/mysql.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/db/mysql.php b/phpBB/db/mysql.php index 6ed2118bd8..96a8a6ea8f 100644 --- a/phpBB/db/mysql.php +++ b/phpBB/db/mysql.php @@ -397,6 +397,11 @@ class sql_db function sql_error($sql = '') { + $result = array( + 'message' => @mysql_error(), + 'code' => @mysql_errno() + ); + if ( !$this->return_on_error ) { if ( $this->transaction ) @@ -411,8 +416,6 @@ class sql_db trigger_error($message, E_USER_ERROR); } - $result['message'] = @mysql_error(); - $result['code'] = @mysql_errno(); return $result; } |