mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-08-11 20:30:23 +00:00
Users: Adjust the initialization of the $duplicated_keys array in wp_salt().
This avoids an endless loop if `get_current_user_id()` is used in a callback attached to the `gettext` filter. With the translated phrase moved into a separate assignment, the function succeeds in setting the static `$duplicated_keys` array once and no longer goes into this code section on subsequent calls. Follow-up to [54249]. Props adityaarora010196, SergeyBiryukov. Fixes #57121. git-svn-id: https://develop.svn.wordpress.org/trunk@55433 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
@@ -2417,14 +2417,16 @@ if ( ! function_exists( 'wp_salt' ) ) :
|
||||
static $duplicated_keys;
|
||||
if ( null === $duplicated_keys ) {
|
||||
$duplicated_keys = array(
|
||||
'put your unique phrase here' => true,
|
||||
/*
|
||||
* translators: This string should only be translated if wp-config-sample.php is localized.
|
||||
* You can check the localized release package or
|
||||
* https://i18n.svn.wordpress.org/<locale code>/branches/<wp version>/dist/wp-config-sample.php
|
||||
*/
|
||||
__( 'put your unique phrase here' ) => true,
|
||||
'put your unique phrase here' => true,
|
||||
);
|
||||
|
||||
/*
|
||||
* translators: This string should only be translated if wp-config-sample.php is localized.
|
||||
* You can check the localized release package or
|
||||
* https://i18n.svn.wordpress.org/<locale code>/branches/<wp version>/dist/wp-config-sample.php
|
||||
*/
|
||||
$duplicated_keys[ __( 'put your unique phrase here' ) ] = true;
|
||||
|
||||
foreach ( array( 'AUTH', 'SECURE_AUTH', 'LOGGED_IN', 'NONCE', 'SECRET' ) as $first ) {
|
||||
foreach ( array( 'KEY', 'SALT' ) as $second ) {
|
||||
if ( ! defined( "{$first}_{$second}" ) ) {
|
||||
|
||||
Reference in New Issue
Block a user