Changeset 2915 for branches/plugin/bbp-includes/bbp-topic-template.php

Timestamp:

02/18/2011 10:38:31 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Prevent fatal error on WordPress 3.0 installs from $wp_query not being setup before this loop is created.

File:

• branches/plugin/bbp-includes/bbp-topic-template.php (modified) (2 diffs)

branches/plugin/bbp-includes/bbp-topic-template.php

@@ -62 +62 @@
  */
 function bbp_has_topics( $args = '' ) {
-    global $wp_rewrite, $bbp, $wpdb;
+    global $wp_rewrite, $wp_query, $bbp, $wpdb;
 
     $default = array (
@@ -111 +111 @@
 
     // If we're viewing a tax/term, use the existing query; if not, run our own
-    if ( !is_tax() ) {
+    if ( !isset( $wp_query ) || !is_tax() )
         $bbp->topic_query = new WP_Query( $bbp_t );
-    } else {
-        global $wp_query;
+    else
         $bbp->topic_query = $wp_query;
-    }
 
     // Limited the number of pages shown