Merge branch 'issue-12097' of github.com:annando/friendica into issue-12097
This commit is contained in:
commit
5b682eb5fb
|
@ -494,7 +494,7 @@ class Site extends BaseAdmin
|
|||
'$enable_multi_reg' => ['enable_multi_reg', DI::l10n()->t('Enable multiple registrations'), !DI::config()->get('system', 'block_extended_register'), DI::l10n()->t('Enable users to register additional accounts for use as pages.')],
|
||||
'$enable_openid' => ['enable_openid', DI::l10n()->t('Enable OpenID'), !DI::config()->get('system', 'no_openid'), DI::l10n()->t('Enable OpenID support for registration and logins.')],
|
||||
'$enable_regfullname' => ['enable_regfullname', DI::l10n()->t('Enable Fullname check'), !DI::config()->get('system', 'no_regfullname'), DI::l10n()->t('Enable check to only allow users to register with a space between the first name and the last name in their full name.')],
|
||||
'$register_notification' => ['register_notification', DI::l10n()->t('Notify admin on new registration'), DI::config()->get('system', 'register_notification'), DI::l10n()->t('If enabled and the system is set to an open registration, a notification for each new registration is sent to the admin.')],
|
||||
'$register_notification' => ['register_notification', DI::l10n()->t('Email administrators on new registration'), DI::config()->get('system', 'register_notification'), DI::l10n()->t('If enabled and the system is set to an open registration, an email for each new registration is sent to the administrators.')],
|
||||
'$community_page_style' => ['community_page_style', DI::l10n()->t('Community pages for visitors'), DI::config()->get('system', 'community_page_style'), DI::l10n()->t('Which community pages should be available for visitors. Local users always see both pages.'), $community_page_style_choices],
|
||||
'$max_author_posts_community_page' => ['max_author_posts_community_page', DI::l10n()->t('Posts per user on community page'), DI::config()->get('system', 'max_author_posts_community_page'), DI::l10n()->t('The maximum number of posts per user on the community page. (Not valid for "Global Community")')],
|
||||
'$mail_able' => function_exists('imap_open'),
|
||||
|
|
|
@ -333,7 +333,6 @@ class Register extends BaseModule
|
|||
|
||||
if ($res) {
|
||||
DI::sysmsg()->addInfo(DI::l10n()->t('Registration successful. Please check your email for further instructions.'));
|
||||
$this->sendNotification($user, 'SYSTEM_REGISTER_NEW');
|
||||
if (DI::config()->get('system', 'register_notification')) {
|
||||
$this->sendNotification($user, 'SYSTEM_REGISTER_NEW');
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user