diff --git a/core/modules/user/config/user.settings.yml b/core/modules/user/config/user.settings.yml index fbb0d98..e421156 100644 --- a/core/modules/user/config/user.settings.yml +++ b/core/modules/user/config/user.settings.yml @@ -2,6 +2,7 @@ admin_role: '' anonymous: Anonymous verify_mail: true notify: + approval_admin_notify: true cancel_confirm: true password_reset: true status_activated: true diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 9806bda..f02d280 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -1690,13 +1690,7 @@ function _user_mail_notify($op, $account, $langcode = NULL) { $site_mail = ini_get('sendmail_from'); } $mail = drupal_mail('user', $op, $account->getEmail(), $langcode, $params, $site_mail); - // Check if admin notification on new users is enabled. - // Notification is set to TRUE by default. - $approval_admin_notify = \Drupal::config('user.settings')->get('notify.approval_admin_notify'); - if ($approval_admin_notify !== FALSE) { - $approval_admin_notify = TRUE; - } - if ($op == 'register_pending_approval' && $approval_admin_notify == TRUE) { + if ($op == 'register_pending_approval' && \Drupal::config('user.settings')->get('notify.approval_admin_notify')) { // If a user registered requiring admin approval, notify the admin, too. // We use the site default language for this. drupal_mail('user', 'register_pending_approval_admin', $site_mail, language_default()->id, $params);