Changeset 10945

Timestamp:

07/18/2016 02:54:07 PM (9 years ago)

Author:

djpaul

Message:

Core: stash the unsubscribe email salt as a static var in bp_get_default_options().

In r10941, an email unsubscribe feature was introduced. This added a new site option that stores the verification salt. For new installations, we added the variable to bp_add_options, and for upgrades, in a new function. We generate the value by using a randomly-generated string.

On WordPress older than 4.4, wp_rand's implementation was causing infinite loops because it adds its own site option, and BuddyPress has some cache clearing logic in bp_core_clear_root_options_cache which is called whenever options are added or updated. WordPress 4.4 re-implemented wp_rand and doesn't cause a loop.

File:

• trunk/src/bp-core/bp-core-options.php (modified) (2 diffs)

trunk/src/bp-core/bp-core-options.php

@@ -19 +19 @@
  */
 function bp_get_default_options() {
+    static $email_unsubscribe_salt = null;
+
+    // Only generate this once to prevent loops in wp_rand() on WP < 4.4.
+    if ( $email_unsubscribe_salt === null ) {
+        $email_unsubscribe_salt = base64_encode( wp_generate_password( 64, true, true ) );
+    }
 
     // Default options.
@@ -75 +81 @@
 
         // Email unsubscribe salt.
-        'bp-emails-unsubscribe-salt'           => base64_encode( wp_generate_password( 64, true, true ) ),
+        'bp-emails-unsubscribe-salt'           => $email_unsubscribe_salt,
 
         /* Groups ************************************************************/