Changeset 3516 for branches/plugin/bbp-includes/bbp-core-compatibility.php

Timestamp:

09/16/2011 11:41:13 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Code formatting improvements to 'pre_get_posts' actions. Remove unused $bbp globals.

File:

• branches/plugin/bbp-includes/bbp-core-compatibility.php (modified) (10 diffs)

branches/plugin/bbp-includes/bbp-core-compatibility.php

@@ -1521 +1521 @@
     // Bail if $posts_query is not the main loop
     if ( $posts_query != $wp_the_query )
-        return $posts_query;
-
-    // Bail if filters are suppressed on this query, or in admin
+        return;
+
+    // Bail if filters are suppressed on this query
     if ( true == $posts_query->get( 'suppress_filters' ) )
-        return $posts_query;
+        return;
 
     // Bail if in admin
     if ( is_admin() )
-        return $posts_query;
+        return;
 
     // Get query variables
@@ -1543 +1543 @@
 
             // Email was passed
-            if ( is_email( $bbp_user ) )
+            if ( is_email( $bbp_user ) ) {
                 $bbp_user = get_user_by( 'email', $bbp_user );
+
             // Try nicename
-            else
+            } else {
                 $bbp_user = get_user_by( 'slug', $bbp_user );
+            }
 
             // If we were successful, set to ID
-            if ( is_object( $bbp_user ) )
+            if ( is_object( $bbp_user ) ) {
                 $bbp_user = $bbp_user->ID;
+            }
         }
 
@@ -1557 +1560 @@
         $user = new WP_User( $bbp_user );
 
-        // Stop if no user
+        // Bail if no user
         if ( !isset( $user ) || empty( $user ) || empty( $user->ID ) ) {
             $posts_query->set_404();
@@ -1569 +1572 @@
 
             // 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 ) )
+            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
@@ -1576 +1580 @@
 
             // Load the core WordPress contact methods
-            if ( !function_exists( '_wp_get_user_contactmethods' ) )
+            if ( !function_exists( '_wp_get_user_contactmethods' ) ) {
                 include_once( ABSPATH . 'wp-includes/registration.php' );
+            }
 
             // Load the edit_user functions
-            if ( !function_exists( 'edit_user' ) )
+            if ( !function_exists( 'edit_user' ) ) {
                 require_once( ABSPATH . 'wp-admin/includes/user.php' );
+            }
 
         // We are viewing a profile
@@ -1598 +1604 @@
 
         // Set author_name as current user's nicename to get correct posts
-        if ( !bbp_is_query_name( 'bbp_widget' ) )
+        if ( !bbp_is_query_name( 'bbp_widget' ) ) {
             $posts_query->set( 'author_name', $user->user_nicename );
+        }
 
         // Set the displayed user global to this user
@@ -1610 +1617 @@
         $view_args = bbp_get_view_query_args( $bbp_view );
 
-        // Stop if view args is false - means the view isn't registered
+        // Bail if view args is false (view isn't registered)
         if ( false === $view_args ) {
             $posts_query->set_404();
@@ -1626 +1633 @@
 
         // We are editing a topic
-        if ( $posts_query->get( 'post_type' ) == bbp_get_topic_post_type() )
+        if ( $posts_query->get( 'post_type' ) == bbp_get_topic_post_type() ) {
             $posts_query->bbp_is_topic_edit = true;
 
         // We are editing a reply
-        elseif ( $posts_query->get( 'post_type' ) == bbp_get_reply_post_type() )
+        } elseif ( $posts_query->get( 'post_type' ) == bbp_get_reply_post_type() ) {
             $posts_query->bbp_is_reply_edit = true;
 
         // We are editing a topic tag
-        elseif ( bbp_is_topic_tag() )
+        } elseif ( bbp_is_topic_tag() ) {
             $posts_query->bbp_is_topic_tag_edit = true;
+        }
 
         // We save post revisions on our own
@@ -1650 +1658 @@
 
         // Add bbp_get_private_status_id() if user is capable
-        if ( current_user_can( 'read_private_forums' ) )
+        if ( current_user_can( 'read_private_forums' ) ) {
             $status[] = bbp_get_private_status_id();
+        }
 
         // Add bbp_get_hidden_status_id() if user is capable
-        if ( current_user_can( 'read_hidden_forums' ) )
+        if ( current_user_can( 'read_hidden_forums' ) ) {
             $status[] = bbp_get_hidden_status_id();
+        }
 
         // Implode and add the statuses
@@ -1666 +1676 @@
         $posts_query->set( 'posts_per_page', get_option( '_bbp_topics_per_page', 15 ) );
     }
-
-    return $posts_query;
 }