Changeset 4171

Timestamp:

08/24/2012 08:12:00 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Bozos:

• Add bozo post status to bbp_has_topics() and bbp_has_replies() if current user is a bozo.

Location:

branches/plugin/bbp-includes

Files:

• bbp-reply-template.php (modified) (2 diffs)
• bbp-topic-template.php (modified) (3 diffs)

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

@@ -44 +44 @@
  *
  * @param mixed $args All the arguments supported by {@link WP_Query}
+ * @uses bbp_is_user_bozo() To add the bozo post status
  * @uses bbp_show_lead_topic() Are we showing the topic as a lead?
  * @uses bbp_get_topic_id() To get the topic id
@@ -68 +69 @@
 
     // What are the default allowed statuses (based on user caps)
-    if ( bbp_get_view_all( 'edit_others_replies' ) )
-        $default_post_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), bbp_get_trash_status_id() ) );
-    else
-        $default_post_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) );
-
-    // Maybe Search 
+    if ( bbp_get_view_all( 'edit_others_replies' ) ) {
+        $post_statuses = array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), bbp_get_trash_status_id() );
+    } else {
+        $post_statuses = array( bbp_get_public_status_id(), bbp_get_closed_status_id() );
+    }
+
+    // Add the bozo status if user is a bozo
+    if ( bbp_is_user_bozo() ) {
+        $post_statuses[] = bbp_get_bozo_status_id();
+    }
+
     $default_reply_search = !empty( $_REQUEST['rs'] ) ? $_REQUEST['rs'] : false;
     $default_post_parent  = ( bbp_is_single_topic() ) ? bbp_get_topic_id() : 'any';
     $default_post_type    = ( bbp_is_single_topic() && bbp_show_lead_topic() ) ? bbp_get_reply_post_type() : array( bbp_get_topic_post_type(), bbp_get_reply_post_type() );
+    $default_post_status  = join( ',', $post_statuses );
 
     // Default query args

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

@@ -63 +63 @@
  * @param mixed $args All the arguments supported by {@link WP_Query}
  * @uses current_user_can() To check if the current user can edit other's topics
+ * @uses bbp_is_user_bozo() To add the bozo post status
  * @uses bbp_get_topic_post_type() To get the topic post type
  * @uses WP_Query To make query and get the topics
@@ -86 +87 @@
 
     // What are the default allowed statuses (based on user caps)
-    if ( bbp_get_view_all() )
-        $default_post_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), bbp_get_trash_status_id() ) );
-    else
-        $default_post_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) );
-
-    $default_topic_search    = !empty( $_REQUEST['ts'] ) ? $_REQUEST['ts'] : false;
-    $default_show_stickies   = (bool) ( bbp_is_single_forum() || bbp_is_topic_archive() ) && ( false === $default_topic_search );
-    $default_post_parent     = bbp_is_single_forum() ? bbp_get_forum_id() : 'any';
+    if ( bbp_get_view_all() ) {
+        $post_statuses = array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), bbp_get_trash_status_id() );
+    } else {
+        $post_statuses = array( bbp_get_public_status_id(), bbp_get_closed_status_id() );
+    }
+
+    // Add the bozo status if user is a bozo
+    if ( bbp_is_user_bozo() ) {
+        $post_statuses[] = bbp_get_bozo_status_id();
+    }
+
+    $default_topic_search  = !empty( $_REQUEST['ts'] ) ? $_REQUEST['ts'] : false;
+    $default_show_stickies = (bool) ( bbp_is_single_forum() || bbp_is_topic_archive() ) && ( false === $default_topic_search );
+    $default_post_parent   = bbp_is_single_forum() ? bbp_get_forum_id() : 'any';
+    $default_post_status   = join( ',', $post_statuses );
 
     // Default argument array
@@ -659 +667 @@
     function bbp_get_topic_post_date( $topic_id = 0, $humanize = false, $gmt = false ) {
         $topic_id = bbp_get_topic_id( $topic_id );
-        
+
         // 4 days, 4 hours ago
         if ( !empty( $humanize ) ) {