Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2656260 by swentel: Cannot edit system mail "Admin (user awaiting approval)"

8.1.x
Alex Pott 2016-01-29 13:28:53 +00:00
parent 8eab9ecb61
commit aab13baef6
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/user/src/AccountSettingsForm.php
View File

@ -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_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.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.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.body', $form_state->getValue('user_mail_status_activated_body'))
->set('status_activated.subject', $form_state->getValue('user_mail_status_activated_subject')) ->set('status_activated.subject', $form_state->getValue('user_mail_status_activated_subject'))
->set('status_blocked.body', $form_state->getValue('user_mail_status_blocked_body')) ->set('status_blocked.body', $form_state->getValue('user_mail_status_blocked_body'))

10
core/modules/user/src/Tests/UserAdminSettingsFormTest.php
View File

@ -37,6 +37,16 @@ class UserAdminSettingsFormTest extends SystemConfigFormTestBase {
'#config_name' => 'user.mail', '#config_name' => 'user.mail',
'#config_key' => 'cancel_confirm.subject', '#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',
),
); );
} }
} }