diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-01-22 13:06:13 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-01-22 13:06:13 +0000 |
| commit | ec959d00014ba92466b676e0a32d662e629825e5 (patch) | |
| tree | 2b8c6998576ff33af61c5263c6f5a2cab43697f6 /phpBB/includes/db | |
| parent | 0650bd4d0d62343b1c137c865bcb8f91468a33d0 (diff) | |
| download | forums-ec959d00014ba92466b676e0a32d662e629825e5.tar forums-ec959d00014ba92466b676e0a32d662e629825e5.tar.gz forums-ec959d00014ba92466b676e0a32d662e629825e5.tar.bz2 forums-ec959d00014ba92466b676e0a32d662e629825e5.tar.xz forums-ec959d00014ba92466b676e0a32d662e629825e5.zip | |
- size select fix
- introduced function for building group options (acp)
- fixed acl_getf if negated option needs to be retrieved
- only using one function for updating post informations
- fixing module display if module is disabled
- if user is having a non-existent style do not print out error message, instead fix the users value and load the default style
git-svn-id: file:///svn/phpbb/trunk@5486 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db')
| -rw-r--r-- | phpBB/includes/db/mysql.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/db/mysql4.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php index 182ed52fdd..57aad449d4 100644 --- a/phpBB/includes/db/mysql.php +++ b/phpBB/includes/db/mysql.php @@ -286,8 +286,8 @@ class dbal_mysql extends dbal function _sql_error() { return array( - 'message' => @mysql_error(), - 'code' => @mysql_errno() + 'message' => @mysql_error($this->db_connect_id), + 'code' => @mysql_errno($this->db_connect_id) ); } diff --git a/phpBB/includes/db/mysql4.php b/phpBB/includes/db/mysql4.php index 143996a028..9db47f37ee 100644 --- a/phpBB/includes/db/mysql4.php +++ b/phpBB/includes/db/mysql4.php @@ -289,8 +289,8 @@ class dbal_mysql4 extends dbal function _sql_error() { return array( - 'message' => @mysql_error(), - 'code' => @mysql_errno() + 'message' => @mysql_error($this->db_connect_id), + 'code' => @mysql_errno($this->db_connect_id) ); } |