eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Initial user doesn't need as strict checking on email

Browse Source
This commit is contained in:
Mikael Nordfeldth
2016-01-16 17:20:26 +01:00
parent 67801a5566
commit bdc38a7204
4 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
classes/User.php
View File

@@ -207,7 +207,7 @@ class User extends Managed_DataObject
* @return User object
* @throws Exception on failure
*/
static function register(array $fields) {
static function register(array $fields, $accept_email_fail=false) {
// MAGICALLY put fields into current scope
@@ -371,8 +371,15 @@ class User extends Managed_DataObject
$profile->query('COMMIT');
if (!empty($email) && !$user->email) {
mail_confirm_address($user, $confirm->code, $profile->nickname, $email);
if (!empty($email) && !empty($user->email)) {
try {
mail_confirm_address($user, $confirm->code, $profile->nickname, $email);
} catch (EmailException $e) {
common_log(LOG_ERR, "Could not send user registration email for user id=={$user->id}: {$e->getMessage()}");
if (!$accept_email_fail) {
throw $e;
}
}
}
// Welcome message