WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No need for wp_get_password_hint() to be prefixed as if it is private. 

Merges [30855] to the 4.1 branch.

props nacin.
see #21243.
Built from https://develop.svn.wordpress.org/branches/4.1@30940


git-svn-id: http://core.svn.wordpress.org/branches/4.1@30929 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2014-12-16 22:19:22 +00:00
parent 01d91c36b7
commit 608ed06fc8
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/install.php
View File

@ -133,7 +133,7 @@ function display_setup_form( $error = null ) {
<input name="admin_password" type="password" id="pass1" size="25" value="" /> <input name="admin_password" type="password" id="pass1" size="25" value="" />
<p><input name="admin_password2" type="password" id="pass2" size="25" value="" /></p> <p><input name="admin_password2" type="password" id="pass2" size="25" value="" /></p>
<div id="pass-strength-result"><?php _e('Strength indicator'); ?></div> <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
<p><?php echo _wp_get_password_hint(); ?></p> <p><?php echo wp_get_password_hint(); ?></p>
</td> </td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>

2
wp-admin/user-edit.php
View File

@ -479,7 +479,7 @@ if ( $show_password_fields ) :
<p class="description"><?php _e( 'Type your new password again.' ); ?></p> <p class="description"><?php _e( 'Type your new password again.' ); ?></p>
<br /> <br />
<div id="pass-strength-result"><?php _e( 'Strength indicator' ); ?></div> <div id="pass-strength-result"><?php _e( 'Strength indicator' ); ?></div>
<p class="description indicator-hint"><?php echo _wp_get_password_hint(); ?></p> <p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
</td> </td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>

2
wp-admin/user-new.php
View File

@ -398,7 +398,7 @@ if ( apply_filters( 'show_password_fields', true ) ) : ?>
<input name="pass2" type="password" id="pass2" autocomplete="off" /> <input name="pass2" type="password" id="pass2" autocomplete="off" />
<br /> <br />
<div id="pass-strength-result"><?php _e('Strength indicator'); ?></div> <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
<p class="description indicator-hint"><?php echo _wp_get_password_hint(); ?></p> <p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
</td> </td>
</tr> </tr>
<tr> <tr>

3
wp-includes/user.php
View File

@ -2093,11 +2093,10 @@ function _wp_get_user_contactmethods( $user = null ) {
* Gets the text suggesting how to create strong passwords. * Gets the text suggesting how to create strong passwords.
* *
* @since 4.1.0 * @since 4.1.0
* @access private
* *
* @return string The password hint text. * @return string The password hint text.
*/ */
function _wp_get_password_hint() { function wp_get_password_hint() {
$hint = __( 'Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ &amp; ).' ); $hint = __( 'Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ &amp; ).' );
/** /**

2
wp-login.php
View File

@ -635,7 +635,7 @@ case 'rp' :
</p> </p>
<div id="pass-strength-result" class="hide-if-no-js"><?php _e('Strength indicator'); ?></div> <div id="pass-strength-result" class="hide-if-no-js"><?php _e('Strength indicator'); ?></div>
<p class="description indicator-hint"><?php echo _wp_get_password_hint(); ?></p> <p class="description indicator-hint"><?php echo wp_get_password_hint(); ?></p>
<br class="clear" /> <br class="clear" />
<?php <?php