From fff891b1d9958da21ac886c958da6ffafaad6623 Mon Sep 17 00:00:00 2001
From: Mark Jaquith <markjaquith@git.wordpress.org>
Date: Wed, 29 Jul 2015 03:55:56 +0000
Subject: [PATCH] Autogenerate passwords that more reliably fit within their
 inputs.

fixes #33166

git-svn-id: https://develop.svn.wordpress.org/trunk@33474 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/install.php | 2 +-
 src/wp-login.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/install.php b/src/wp-admin/install.php
index 1bdd6e261f..4eab6b303f 100644
--- a/src/wp-admin/install.php
+++ b/src/wp-admin/install.php
@@ -137,7 +137,7 @@ function display_setup_form( $error = null ) {
 			</th>
 			<td>
 				<div class="">
-					<?php $initial_password = wp_generate_password( 24 ); ?>
+					<?php $initial_password = wp_generate_password( 18 ); ?>
 					<input type="password" name="admin_password" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
 					<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
 						<span class="dashicons dashicons-hidden"></span>
diff --git a/src/wp-login.php b/src/wp-login.php
index 4955d6be2d..57b2a2ef17 100644
--- a/src/wp-login.php
+++ b/src/wp-login.php
@@ -656,7 +656,7 @@ case 'rp' :
 		<label for="pass1"><?php _e('New password') ?></label><br />
 		<div class="wp-pwd">
 			<span class="password-input-wrapper">
-				<input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" aria-describedby="pass-strength-result" />
+				<input type="password" data-reveal="1" data-pw="<?php echo esc_attr( wp_generate_password( 16 ) ); ?>" name="pass1" id="pass1" class="input" size="20" value="" autocomplete="off" aria-describedby="pass-strength-result" />
 			</span>
 			<div id="pass-strength-result" class="hide-if-no-js" aria-live="polite"><?php _e( 'Strength indicator' ); ?></div>
 		</div>