From 4418321c950784b44a6348a30ed64a57c2a917be Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Sun, 5 Jan 2014 11:58:18 +0000
Subject: [PATCH] Revert "Issue #1226044 by pgrond, martin107, roborn,
rbayliss: The password_confirm element should not be aware of the
user_form_process_password_confirm process."
This reverts commit dc2e4720df835a8d09e10eb22cb5b96747740c20.
---
core/modules/system/system.module | 2 +-
.../user/lib/Drupal/user/AccountFormController.php | 2 --
core/modules/user/user.module | 9 ++++++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/core/modules/system/system.module b/core/modules/system/system.module
index 83cc650f201f..f9ae056b30b0 100644
--- a/core/modules/system/system.module
+++ b/core/modules/system/system.module
@@ -419,7 +419,7 @@ function system_element_info() {
);
$types['password_confirm'] = array(
'#input' => TRUE,
- '#process' => array('form_process_password_confirm'),
+ '#process' => array('form_process_password_confirm', 'user_form_process_password_confirm'),
'#theme_wrappers' => array('form_element'),
);
$types['textarea'] = array(
diff --git a/core/modules/user/lib/Drupal/user/AccountFormController.php b/core/modules/user/lib/Drupal/user/AccountFormController.php
index eca2eb29d48f..4983b0f0bedd 100644
--- a/core/modules/user/lib/Drupal/user/AccountFormController.php
+++ b/core/modules/user/lib/Drupal/user/AccountFormController.php
@@ -99,7 +99,6 @@ public function form(array $form, array &$form_state) {
'#type' => 'password_confirm',
'#size' => 25,
'#description' => $this->t('To change the current user password, enter the new password in both fields.'),
- '#pre_render' => array('user_form_pre_render_password_confirm'),
);
// To skip the current password field, the user must have logged in via a
@@ -147,7 +146,6 @@ public function form(array $form, array &$form_state) {
'#type' => 'password_confirm',
'#size' => 25,
'#description' => $this->t('Provide a password for the new account in both fields.'),
- '#pre_render' => array('user_form_pre_render_password_confirm'),
'#required' => TRUE,
);
}
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index f551063c5173..f6a30cbde5da 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -1699,10 +1699,13 @@ function _user_mail_notify($op, $account, $langcode = NULL) {
/**
* Form element process handler for client-side password validation.
*
- * This #pre_render handler is added to the user registration form to add the
- * JavaScript and string translations for dynamic password validation.
+ * This #process handler is automatically invoked for 'password_confirm' form
+ * elements to add the JavaScript and string translations for dynamic password
+ * validation.
+ *
+ * @see system_element_info()
*/
-function user_form_pre_render_password_confirm($element) {
+function user_form_process_password_confirm($element) {
$password_settings = array(
'confirmTitle' => t('Passwords match:'),
'confirmSuccess' => t('yes'),
--
GitLab