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

Users: Merge two duplicate strings introduced in [37940]. 

Props dimadin.
Fixes #37644.
Built from https://develop.svn.wordpress.org/trunk@38250


git-svn-id: http://core.svn.wordpress.org/trunk@38191 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2016-08-12 14:12:32 +00:00
parent 3a0771b986
commit f25445a378
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/script-loader.php
View File

@ -400,7 +400,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter', 'wp-util' ), false, 1 ); $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter', 'wp-util' ), false, 1 );
did_action( 'init' ) && $scripts->localize( 'user-profile', 'userProfileL10n', array( did_action( 'init' ) && $scripts->localize( 'user-profile', 'userProfileL10n', array(
'warn' => __( 'Your new password has not been saved.' ), 'warn' => __( 'Your new password has not been saved.' ),
'warnWeak' => __( 'Confirm use of weak password.' ), 'warnWeak' => __( 'Confirm use of weak password' ),
'show' => __( 'Show' ), 'show' => __( 'Show' ),
'hide' => __( 'Hide' ), 'hide' => __( 'Hide' ),
'cancel' => __( 'Cancel' ), 'cancel' => __( 'Cancel' ),

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38248'; $wp_version = '4.7-alpha-38250';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.