harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

doco

Browse Source
This commit is contained in:
friendica 2014-07-10 19:29:51 -07:00
parent 9a96ae041f
commit 83ad5328c8
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/auth.php
View File

@ -36,8 +36,14 @@ function nuke_session() {
function account_verify_password($email,$pass) { function account_verify_password($email,$pass) {
$email_verify = get_config('system','verify_email'); $email_verify = get_config('system','verify_email');
$register_policy = get_config('system','register_policy');
if($email_verify && $record['account_flags'] & ACCOUNT_UNVERIFIED) // Currently we only verify email address if there is an open registration policy.
// This isn't because of any policy - it's because the workflow gets too complicated if
// you have to verify the email and then go through the account approval workflow before
// letting them login.
if(($email_verify) && ($register_policy == REGISTER_OPEN) && ($record['account_flags'] & ACCOUNT_UNVERIFIED))
return null; return null;
$r = q("select * from account where account_email = '%s'", $r = q("select * from account where account_email = '%s'",

2
version.inc
View File

@ -1 +1 @@
2014-07-09.731 2014-07-10.732