Changeset 2971

Timestamp:

04/01/2011 01:53:46 AM (14 years ago)

Author:

johnjamesjacoby

Message:

More clean-up to bbp_pre_get_posts. Fixes #1450.

File:

• branches/plugin/bbp-includes/bbp-general-functions.php (modified) (5 diffs)

branches/plugin/bbp-includes/bbp-general-functions.php

@@ -847 +847 @@
  */
 function bbp_pre_get_posts( $wp_query ) {
-    global $bbp, $wp_version;
+    global $bbp;
 
     // Bail if $wp_query is empty or of incorrect class
@@ -885 +885 @@
         }
 
-        // Confirmed existence of the bbPress user
-
-        // Define new query variable
+        /** User Exists *******************************************************/
+
+        // View or edit?
         if ( !empty( $is_edit ) ) {
+
             // Only allow super admins on multisite to edit every user.
             if ( ( is_multisite() && !current_user_can( 'manage_network_users' ) && $user_id != $current_user->ID && !apply_filters( 'enable_edit_any_user_configuration', true ) ) || !current_user_can( 'edit_user', $user->ID ) )
                 wp_die( __( 'You do not have the permission to edit this user.', 'bbpress' ) );
 
+            // We are editing a profile
             $wp_query->bbp_is_user_profile_edit = true;
 
-            // Load the required user editing functions
+            // Load the core WordPress contact methods
             if ( !function_exists( '_wp_get_user_contactmethods' ) )
                 include_once( ABSPATH . 'wp-includes/registration.php' );
 
+            // Load the edit_user functions
             if ( !function_exists( 'edit_user' ) )
                 require_once( ABSPATH . 'wp-admin/includes/user.php' );
 
+        // We are viewing a profile
         } else {
             $wp_query->bbp_is_user_profile_page = true;
@@ -925 +929 @@
     } elseif ( !empty( $bbp_view ) ) {
 
-        // Check if the view exists by checking if there are query args are set or not
+        // Check if the view exists by checking if there are query args are set
         $view_args = bbp_get_view_query_args( $bbp_view );
 
@@ -934 +938 @@
         }
 
+        // We are in a custom topic view
         $wp_query->bbp_is_view = true;
 
@@ -939 +944 @@
     } elseif ( !empty( $is_edit ) ) {
 
-        // It is a topic edit page
+        // We are editing a topic
         if ( get_query_var( 'post_type' ) == bbp_get_topic_post_type() )
             $wp_query->bbp_is_topic_edit = true;
 
-        // It is a reply edit page
+        // We are editing a reply
         elseif ( get_query_var( 'post_type' ) == bbp_get_reply_post_type() )
             $wp_query->bbp_is_reply_edit = true;