Changeset 2914 for branches/plugin/bbp-includes/bbp-general-template.php

Timestamp:

02/18/2011 10:16:22 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Decouple bbp_is_ functionality from bbp_get_{post_type}_id functionality, and use correctly through-out. Add ability to show all forums regardless of post_parent, and fix forums widget to use this functionality correctly.

File:

• branches/plugin/bbp-includes/bbp-general-template.php (modified) (12 diffs)

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

@@ -47 +47 @@
     global $wp_query, $bbp;
 
-    if ( is_singular( bbp_get_forum_post_type() ) )
-        return true;
-
-    if ( isset( $wp_query->query_vars['post_type'] ) && bbp_get_forum_post_type() === $wp_query->query_vars['post_type'] )
-        return true;
-
-    if ( isset( $_GET['post_type'] ) && !empty( $_GET['post_type'] ) && bbp_get_forum_post_type() === $_GET['post_type'] )
-        return true;
-
-    if ( !empty( $post_id ) && ( bbp_get_forum_post_type() == get_post_field( 'post_type', $post_id ) ) )
+    if ( empty( $post_id ) ) {
+
+        if ( is_singular( bbp_get_forum_post_type() ) )
+            return true;
+
+        if ( isset( $wp_query->query_vars['post_type'] ) && ( bbp_get_forum_post_type() === $wp_query->query_vars['post_type'] ) )
+            return true;
+
+        if ( isset( $_GET['post_type'] ) && !empty( $_GET['post_type'] ) && ( bbp_get_forum_post_type() === $_GET['post_type'] ) )
+            return true;
+
+    } elseif ( !empty( $post_id ) && ( bbp_get_forum_post_type() == get_post_field( 'post_type', $post_id ) ) )
         return true;
 
@@ -80 +82 @@
         return false;
 
-    if ( is_singular( bbp_get_topic_post_type() ) )
-        return true;
-
-    if ( isset( $wp_query->query_vars['post_type'] ) && bbp_get_topic_post_type() === $wp_query->query_vars['post_type'] )
-        return true;
-
-    if ( isset( $_GET['post_type'] ) && !empty( $_GET['post_type'] ) && bbp_get_topic_post_type() === $_GET['post_type'] )
-        return true;
-
-    if ( !empty( $post_id ) && ( bbp_get_topic_post_type() == get_post_field( 'post_type', $post_id ) ) )
+    if ( empty( $post_id ) ) {
+
+        if ( is_singular( bbp_get_topic_post_type() ) )
+            return true;
+
+        if ( isset( $wp_query->query_vars['post_type'] ) && ( bbp_get_topic_post_type() === $wp_query->query_vars['post_type'] ) )
+            return true;
+
+        if ( isset( $_GET['post_type'] ) && !empty( $_GET['post_type'] ) && ( bbp_get_topic_post_type() === $_GET['post_type'] ) )
+            return true;
+
+    } elseif ( !empty( $post_id ) && ( bbp_get_topic_post_type() == get_post_field( 'post_type', $post_id ) ) )
         return true;
 
@@ -122 +126 @@
 function bbp_is_topic_merge() {
 
-    if ( bbp_is_topic_edit() && !empty( $_GET['action'] ) && 'merge' == $_GET['action'] )
+    if ( bbp_is_topic_edit() && !empty( $_GET['action'] ) && ( 'merge' == $_GET['action'] ) )
         return true;
 
@@ -138 +142 @@
 function bbp_is_topic_split() {
 
-    if ( bbp_is_topic_edit() && !empty( $_GET['action'] ) && 'split' == $_GET['action'] )
+    if ( bbp_is_topic_edit() && !empty( $_GET['action'] ) && ( 'split' == $_GET['action'] ) )
         return true;
 
@@ -162 +166 @@
         return false;
 
-    if ( is_singular( bbp_get_reply_post_type() ) )
-        return true;
-
-    if ( isset( $wp_query->query_vars['post_type'] ) && bbp_get_reply_post_type() === $wp_query->query_vars['post_type'] )
-        return true;
-
-    if ( isset( $_GET['post_type'] ) && !empty( $_GET['post_type'] ) && bbp_get_reply_post_type() === $_GET['post_type'] )
-        return true;
-
-    if ( !empty( $post_id ) && ( bbp_get_reply_post_type() == get_post_field( 'post_type', $post_id ) ) )
+    if ( empty( $post_id ) ) {
+
+        if ( is_singular( bbp_get_reply_post_type() ) )
+            return true;
+
+        if ( isset( $wp_query->query_vars['post_type'] ) && ( bbp_get_reply_post_type() === $wp_query->query_vars['post_type'] ) )
+            return true;
+
+        if ( isset( $_GET['post_type'] ) && !empty( $_GET['post_type'] ) && ( bbp_get_reply_post_type() === $_GET['post_type'] ) )
+            return true;
+
+    } elseif ( !empty( $post_id ) && ( bbp_get_reply_post_type() == get_post_field( 'post_type', $post_id ) ) )
         return true;
 
@@ -188 +194 @@
     global $wp_query;
 
-    if ( !empty( $wp_query->bbp_is_reply_edit ) && $wp_query->bbp_is_reply_edit == true )
+    if ( !empty( $wp_query->bbp_is_reply_edit ) && ( true == $wp_query->bbp_is_reply_edit ) )
         return true;
 
@@ -211 +217 @@
         return false;
 
-    if ( !empty( $query_name_check ) && 'bbp_user_profile_favorites' != bbp_get_query_name() )
+    if ( !empty( $query_name_check ) && ( 'bbp_user_profile_favorites' != bbp_get_query_name() ) )
         return false;
 
@@ -234 +240 @@
         return false;
 
-    if ( !empty( $query_name_check ) && 'bbp_user_profile_subscriptions' != bbp_get_query_name() )
+    if ( !empty( $query_name_check ) && ( 'bbp_user_profile_subscriptions' != bbp_get_query_name() ) )
         return false;
 
@@ -258 +264 @@
         return false;
 
-    if ( !empty( $query_name_check ) && 'bbp_user_profile_topics_created' != bbp_get_query_name() )
+    if ( !empty( $query_name_check ) && ( 'bbp_user_profile_topics_created' != bbp_get_query_name() ) )
         return false;
 
@@ -292 +298 @@
     global $wp_query;
 
-    if ( !empty( $wp_query->bbp_is_user_profile_page ) && $wp_query->bbp_is_user_profile_page == true )
+    if ( !empty( $wp_query->bbp_is_user_profile_page ) && ( true == $wp_query->bbp_is_user_profile_page ) )
         return true;
 
@@ -309 +315 @@
     global $wp_query;
 
-    if ( !empty( $wp_query->bbp_is_user_profile_edit ) && $wp_query->bbp_is_user_profile_edit == true )
+    if ( !empty( $wp_query->bbp_is_user_profile_edit ) && ( true == $wp_query->bbp_is_user_profile_edit ) )
         return true;
 
@@ -326 +332 @@
     global $wp_query;
 
-    if ( !empty( $wp_query->bbp_is_view ) && $wp_query->bbp_is_view == true )
+    if ( !empty( $wp_query->bbp_is_view ) && ( true == $wp_query->bbp_is_view ) )
         return true;