From 2f05ca63321753175679310857b84619bac025bb Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 2 Jul 2015 11:50:23 +0200
Subject: [PATCH] Wizard: Re-render passwords on the admin account and db
 creation page

That's not placeholders, actually, but this will be solved in a
different issue. (in a more generic way)

fixes #9545
---
 .../setup/application/forms/AdminAccountPage.php | 16 +++++++++-------
 .../application/forms/DatabaseCreationPage.php   |  5 +++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/modules/setup/application/forms/AdminAccountPage.php b/modules/setup/application/forms/AdminAccountPage.php
index 2d3e9d712..90ccd6fe5 100644
--- a/modules/setup/application/forms/AdminAccountPage.php
+++ b/modules/setup/application/forms/AdminAccountPage.php
@@ -167,21 +167,23 @@ class AdminAccountPage extends Form
                 'password',
                 'new_user_password',
                 array(
-                    'required'      => true,
-                    'label'         => $this->translate('Password'),
-                    'description'   => $this->translate('Enter the password to assign to the newly created account')
+                    'required'          => true,
+                    'renderPassword'    => true,
+                    'label'             => $this->translate('Password'),
+                    'description'       => $this->translate('Enter the password to assign to the newly created account')
                 )
             );
             $this->addElement(
                 'password',
                 'new_user_2ndpass',
                 array(
-                    'required'      => true,
-                    'label'         => $this->translate('Repeat password'),
-                    'description'   => $this->translate(
+                    'required'          => true,
+                    'renderPassword'    => true,
+                    'label'             => $this->translate('Repeat password'),
+                    'description'       => $this->translate(
                         'Please repeat the password given above to avoid typing errors'
                     ),
-                    'validators'    => array(
+                    'validators'        => array(
                         array('identical', false, array('new_user_password'))
                     )
                 )
diff --git a/modules/setup/application/forms/DatabaseCreationPage.php b/modules/setup/application/forms/DatabaseCreationPage.php
index b3ecca3b9..17cae3aca 100644
--- a/modules/setup/application/forms/DatabaseCreationPage.php
+++ b/modules/setup/application/forms/DatabaseCreationPage.php
@@ -107,8 +107,9 @@ class DatabaseCreationPage extends Form
             'password',
             'password',
             array(
-                'label'         => $this->translate('Password'),
-                'description'   => $this->translate('The password for the database user defined above')
+                'renderPassword'    => true,
+                'label'             => $this->translate('Password'),
+                'description'       => $this->translate('The password for the database user defined above')
             )
         );