Changeset 59434

Timestamp:

11/20/2024 01:51:21 PM (11 days ago)

Author:

desrosj

Message:

Options, Meta APIs: Ensure duplicate salts are properly flagged.

Improvements were made in 6.7 to ensure that salts stored in the database were primed more efficiently.

The logic added to accomplish this suffered from an edge case where array indexes were unexpectedly missing when wp_salt() was called recursively.

Follow up to [58837].

Reviewed by davidbaumwald.
Merges [59427] to the 6.7 branch.

Props juliobox, ankitkumarshah, dilipbheda, johnbillion, joemcgill, desrosj.
Fixes #62424.

Location:

branches/6.7

Files:

• . (modified) (1 prop)
• src/wp-includes/pluggable.php (modified) (2 diffs)

branches/6.7/src/wp-includes/pluggable.php

@@ -2480 +2480 @@
         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
-             */
-            $duplicated_keys[ __( 'put your unique phrase here' ) ] = true;
+            $duplicated_keys = array();
 
             foreach ( array( 'AUTH', 'SECURE_AUTH', 'LOGGED_IN', 'NONCE', 'SECRET' ) as $first ) {
@@ -2500 +2491 @@
                 }
             }
+
+            $duplicated_keys['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;
         }