Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Improve the tone of key/salts recommendation message.

Browse Source 
Also adds some inline comments to make it easier to understand how it
is determined whether to show the message or not.

Props helen.
Fixes #20779.


Built from https://develop.svn.wordpress.org/trunk@33026


git-svn-id: http://core.svn.wordpress.org/trunk@32997 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Konstantin Obenland 2015-07-01 15:39:26 +00:00
parent 2b513bf60a
commit d9c5529d30
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-admin/maint/repair.php
View File

@ -35,20 +35,25 @@ if ( ! defined( 'WP_ALLOW_REPAIR' ) ) {
foreach ( array( 'AUTH_KEY', 'SECURE_AUTH_KEY', 'LOGGED_IN_KEY', 'NONCE_KEY', 'AUTH_SALT', 'SECURE_AUTH_SALT', 'LOGGED_IN_SALT', 'NONCE_SALT' ) as $key ) { foreach ( array( 'AUTH_KEY', 'SECURE_AUTH_KEY', 'LOGGED_IN_KEY', 'NONCE_KEY', 'AUTH_SALT', 'SECURE_AUTH_SALT', 'LOGGED_IN_SALT', 'NONCE_SALT' ) as $key ) {
if ( defined( $key ) ) { if ( defined( $key ) ) {
// Check for unique values of each key.
$duplicated_keys[ constant( $key ) ] = isset( $duplicated_keys[ constant( $key ) ] ); $duplicated_keys[ constant( $key ) ] = isset( $duplicated_keys[ constant( $key ) ] );
} else { } else {
// If a constant is not defined, it's missing.
$missing_key = true; $missing_key = true;
} }
} }
// If at least one key uses the default value, consider it duplicated.
if ( isset( $duplicated_keys[ $default_key ] ) ) { if ( isset( $duplicated_keys[ $default_key ] ) ) {
$duplicated_keys[ $default_key ] = true; $duplicated_keys[ $default_key ] = true;
} }
// Weed out all unique, non-default values.
$duplicated_keys = array_filter( $duplicated_keys ); $duplicated_keys = array_filter( $duplicated_keys );
if ( $duplicated_keys || $missing_key ) { if ( $duplicated_keys || $missing_key ) {
// Translators: 1: wp-config.php; 2: Secret key service URL. // Translators: 1: wp-config.php; 2: Secret key service URL.
echo '<p>' . sprintf( __( 'While you are in your %1$s file, you should also make sure you have the 8 unique phrases in place. You can generate these using the <a href="%2$s">WordPress.org secret key service</a>.' ), '<code>wp-config.php</code>', 'https://api.wordpress.org/secret-key/1.1/salt/' ) . '</p>'; echo '<p>' . sprintf( __( 'While you are editing your %1$s file, take a moment to make sure you have all 8 keys and that they are unique. You can generate these using the <a href="%2$s">WordPress.org secret key service</a>.' ), '<code>wp-config.php</code>', 'https://api.wordpress.org/secret-key/1.1/salt/' ) . '</p>';
} }
} elseif ( isset( $_GET['repair'] ) ) { } elseif ( isset( $_GET['repair'] ) ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-33025'; $wp_version = '4.3-alpha-33026';
/** /**
* 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.