Changeset 10823

Timestamp:

05/29/2016 04:26:39 PM (9 years ago)

Author:

djpaul

Message:

Update the "bp_setup_current_user was called incorrectly" whitelist for the Customizer.

Change based on _wp_customize_include.
The previous approach was not working on recent versions of WordPress because the global wasn't set yet.

Fixes #7086

File:

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

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

@@ -208 +208 @@
  * Set up the currently logged-in user.
  *
- * We white-list the WordPress customizer which purposely loads the user early.
+ * We white-list the WordPress Customizer which purposely loads the user early.
+ * If the current user is being setup before the "init" action has fired,
+ * strange (and difficult to debug) role/capability issues will occur.
  *
  * @since 1.7.0
@@ -219 +221 @@
  */
 function bp_setup_current_user() {
-
-    // If the current user is being setup before the "init" action has fired,
-    // strange (and difficult to debug) role/capability issues will occur.
-    if ( ! isset( $GLOBALS['wp_customize'] ) && ! did_action( 'after_setup_theme' ) ) {
+    $skip_warning = (
+        ( isset( $_REQUEST['wp_customize'] ) && 'on' === $_REQUEST['wp_customize'] ) ||
+        ( is_admin() && 'customize.php' === basename( $_SERVER['PHP_SELF'] ) )
+    );
+
+    if ( ! $skip_warning && ! did_action( 'after_setup_theme' ) ) {
         $e = new Exception;
         $trace = $e->getTraceAsString();