aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/auth/auth_db.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-03-18 14:47:43 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-03-18 14:47:43 +0000
commit02a5032a52784339e75d0d3fc9c24e92e235c26b (patch)
tree7be064ec5e37c3a81e35971a7f7d8c5519388f6c /phpBB/includes/auth/auth_db.php
parentc34599126fe8a7d38b604ceb92136be6a6c89ee8 (diff)
downloadforums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar
forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar.gz
forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar.bz2
forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.tar.xz
forums-02a5032a52784339e75d0d3fc9c24e92e235c26b.zip
merging... again
git-svn-id: file:///svn/phpbb/trunk@8452 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/auth/auth_db.php')
-rw-r--r--phpBB/includes/auth/auth_db.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php
index aa09710730..00dd438210 100644
--- a/phpBB/includes/auth/auth_db.php
+++ b/phpBB/includes/auth/auth_db.php
@@ -32,8 +32,18 @@ function login_db(&$username, &$password)
if (!$password)
{
return array(
- 'status' => LOGIN_BREAK,
+ 'status' => LOGIN_ERROR_PASSWORD,
'error_msg' => 'NO_PASSWORD_SUPPLIED',
+ 'user_row' => array('user_id' => ANONYMOUS),
+ );
+ }
+
+ if (!$username)
+ {
+ return array(
+ 'status' => LOGIN_ERROR_USERNAME,
+ 'error_msg' => 'LOGIN_ERROR_USERNAME',
+ 'user_row' => array('user_id' => ANONYMOUS),
);
}