Changeset 7508 for trunk/bp-core/bp-core-template-loader.php

Timestamp:

11/02/2013 10:36:10 PM (12 years ago)

Author:

boonebgorges

Message:

Bail out of loading buddypress-functions.php if $wp_query is not set

When $wp_query is not set, it means either that the main query has not run,
or that it has been somehow wiped out. Having an empty $wp_query global causes
problems in load_template() (used to load buddypress-functions.php()) because
of the way load_template() populates certain global variables from $wp_query.

An empty $wp_query global should not happen during normal page loads, but does
happen sometimes during unit testing, when globals are directly manipulated by
the bootstrap.

File:

• trunk/bp-core/bp-core-template-loader.php (modified) (2 diffs)

trunk/bp-core/bp-core-template-loader.php

@@ -398 +398 @@
  */
 function bp_load_theme_functions() {
-    global $pagenow;
+    global $pagenow, $wp_query;
 
     // do not load our custom BP functions file if theme compat is disabled
@@ -408 +408 @@
     if ( bp_is_deactivation() )
         return;
+
+    // If the $wp_query global is empty (the main query has not been run,
+    // or has been reset), load_template() will fail at setting certain
+    // global values. This does not happen on a normal page load, but can
+    // cause problems when running automated tests
+    if ( ! is_a( $wp_query, 'WP_Query' ) ) {
+        return;
+    }
 
     // Only include if not installing or if activating via wp-activate.php