From aab13baef6712fbe1b984ece865fc004c8b712d4 Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Fri, 29 Jan 2016 13:28:53 +0000 Subject: [PATCH] Issue #2656260 by swentel: Cannot edit system mail "Admin (user awaiting approval)" --- core/modules/user/src/AccountSettingsForm.php | 2 ++ .../user/src/Tests/UserAdminSettingsFormTest.php | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/core/modules/user/src/AccountSettingsForm.php b/core/modules/user/src/AccountSettingsForm.php index b76897d8db63..e7148844bd95 100644 --- a/core/modules/user/src/AccountSettingsForm.php +++ b/core/modules/user/src/AccountSettingsForm.php @@ -451,6 +451,8 @@ class AccountSettingsForm extends ConfigFormBase { ->set('register_no_approval_required.subject', $form_state->getValue('user_mail_register_no_approval_required_subject')) ->set('register_pending_approval.body', $form_state->getValue('user_mail_register_pending_approval_body')) ->set('register_pending_approval.subject', $form_state->getValue('user_mail_register_pending_approval_subject')) + ->set('register_pending_approval_admin.body', $form_state->getValue('register_pending_approval_admin_body')) + ->set('register_pending_approval_admin.subject', $form_state->getValue('register_pending_approval_admin_subject')) ->set('status_activated.body', $form_state->getValue('user_mail_status_activated_body')) ->set('status_activated.subject', $form_state->getValue('user_mail_status_activated_subject')) ->set('status_blocked.body', $form_state->getValue('user_mail_status_blocked_body')) diff --git a/core/modules/user/src/Tests/UserAdminSettingsFormTest.php b/core/modules/user/src/Tests/UserAdminSettingsFormTest.php index 904cea4632e5..57bfb8e79715 100644 --- a/core/modules/user/src/Tests/UserAdminSettingsFormTest.php +++ b/core/modules/user/src/Tests/UserAdminSettingsFormTest.php @@ -37,6 +37,16 @@ class UserAdminSettingsFormTest extends SystemConfigFormTestBase { '#config_name' => 'user.mail', '#config_key' => 'cancel_confirm.subject', ), + 'register_pending_approval_admin_body' => array( + '#value' => $this->randomString(), + '#config_name' => 'user.mail', + '#config_key' => 'register_pending_approval_admin.body', + ), + 'register_pending_approval_admin_subject' => array( + '#value' => $this->randomString(20), + '#config_name' => 'user.mail', + '#config_key' => 'register_pending_approval_admin.subject', + ), ); } }