aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-13 10:43:57 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-13 10:43:57 +0000
commitb0b096489393d505e105ba74b09a72afcfb7c1cf (patch)
tree7c102c88f1b0bf43e5c5464ab3c238343091abce /engine/lib
parenta943cc400d20391c63b1a967d43e2a86ae63765d (diff)
downloadelgg-b0b096489393d505e105ba74b09a72afcfb7c1cf.tar.gz
elgg-b0b096489393d505e105ba74b09a72afcfb7c1cf.tar.bz2
Fixes #238: Problem was caused by authenticate not having the user email validated flag set.
Introduced new flag ->admin_created to distinguish between the two types. git-svn-id: https://code.elgg.org/elgg/trunk@1883 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/sessions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/lib/sessions.php b/engine/lib/sessions.php
index 54cd6169e..f909ae60f 100644
--- a/engine/lib/sessions.php
+++ b/engine/lib/sessions.php
@@ -78,7 +78,7 @@
if ($user = get_user_by_username($credentials['username'])) {
// Let admins log in without validating their email, but normal users must have validated their email
- if ((!$user->admin) && (!$user->validated_email))
+ if ((!$user->admin) && (!$user->validated_email) && (!$user->admin_created))
return false;
if ($user->password == generate_user_password($user, $credentials['password'])) {