aboutsummaryrefslogtreecommitdiff
path: root/actions/login.php
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-05-28 09:52:51 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-05-28 09:52:51 +0000
commite7dab1a754c85b8f1e7beeac49496ed9e7435b45 (patch)
treeb1a188e8a47ab2de377978da77231895c3c41f86 /actions/login.php
parent81aab13d04f3e774965ddbffe638ccede8656d7b (diff)
downloadelgg-e7dab1a754c85b8f1e7beeac49496ed9e7435b45.tar.gz
elgg-e7dab1a754c85b8f1e7beeac49496ed9e7435b45.tar.bz2
Revamped the login functions to separate login from authentication.
git-svn-id: https://code.elgg.org/elgg/trunk@728 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'actions/login.php')
-rw-r--r--actions/login.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/actions/login.php b/actions/login.php
index e79799a30..1a47dcb51 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -17,9 +17,12 @@
$password = get_input("password");
$persistent = get_input("persistent");
- // If all is present and correct, try to log in
+ // If all is present and correct, try to log in
+ $result = false;
if (!empty($username) && !empty($password)) {
- $result = login($username, $password, $persistent);
+ if ($user = authenticate($username,$password)) {
+ $result = login($user, $persistent);
+ }
}
// Set the system_message as appropriate