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

Timestamp:

09/10/2011 10:27:19 PM (13 years ago)

Author:

johnjamesjacoby

Message:

API adjustments:

• Refactor _status_ vars into callable functions.
• Audit usage of $bbp global.
• Perform get_class() checks on extensions to avoid errors if global $bbp is overloaded.
• Bump DB version to 175.

File:

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

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

@@ -71 +71 @@
     // What are the default allowed statuses (based on user caps)
     if ( !bbp_is_query_name( 'bbp_widget' ) && bbp_get_view_all() )
-        $default_status = join( ',', array( 'publish', $bbp->closed_status_id, $bbp->spam_status_id, 'trash' ) );
+        $default_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_status = join( ',', array( 'publish', $bbp->closed_status_id ) );
+        $default_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) );
 
     // Default arguments
@@ -121 +121 @@
     extract( $bbp_t );
 
-    // If we're viewing a tax/term, use the existing query; if not, run our own
-    if ( bbp_is_topic_tag() && !bbp_is_query_name( 'bbp_widget' ) )
-        $bbp->topic_query = $wp_query;
-    else
-        $bbp->topic_query = new WP_Query( $bbp_t );
+    // Call the query
+    $bbp->topic_query = new WP_Query( $bbp_t );
 
     // Set post_parent back to 0 if originally set to 'any'
@@ -904 +901 @@
      */
     function bbp_is_topic_closed( $topic_id = 0 ) {
-        global $bbp;
-
-        if ( $bbp->closed_status_id == bbp_get_topic_status( $topic_id ) )
+        if ( bbp_get_closed_status_id() == bbp_get_topic_status( $topic_id ) )
             return true;
 
@@ -966 +961 @@
  */
 function bbp_is_topic_published( $topic_id = 0 ) {
-    global $bbp;
-
     $topic_status = bbp_get_topic_status( bbp_get_topic_id( $topic_id ) );
-    return 'publish' == $topic_status;
+    return bbp_get_public_status_id() == $topic_status;
 }
 
@@ -983 +976 @@
  */
 function bbp_is_topic_spam( $topic_id = 0 ) {
-    global $bbp;
-
     $topic_status = bbp_get_topic_status( bbp_get_topic_id( $topic_id ) );
-    return $bbp->spam_status_id == $topic_status;
+    return bbp_get_spam_status_id() == $topic_status;
 }
 
@@ -1000 +991 @@
  */
 function bbp_is_topic_trash( $topic_id = 0 ) {
-    global $bbp;
-
     $topic_status = bbp_get_topic_status( bbp_get_topic_id( $topic_id ) );
-    return $bbp->trash_status_id == $topic_status;
+    return bbp_get_trash_status_id() == $topic_status;
 }
 
@@ -1703 +1692 @@
      */
     function bbp_get_topic_replies_link( $topic_id = 0 ) {
-        global $bbp;
 
         $topic    = bbp_get_topic( bbp_get_topic_id( (int) $topic_id ) );
@@ -1990 +1978 @@
      */
     function bbp_get_topic_admin_links( $args = '' ) {
-        global $bbp;
 
         if ( !bbp_is_single_topic() )
@@ -2025 +2012 @@
         // See if links need to be unset
         $topic_status = bbp_get_topic_status( $r['id'] );
-        if ( in_array( $topic_status, array( $bbp->spam_status_id, $bbp->trash_status_id ) ) ) {
+        if ( in_array( $topic_status, array( bbp_get_spam_status_id(), bbp_get_trash_status_id() ) ) ) {
 
             // Close link shouldn't be visible on trashed/spammed topics
@@ -2031 +2018 @@
 
             // Spam link shouldn't be visible on trashed topics
-            if ( $topic_status == $bbp->trash_status_id )
+            if ( $topic_status == bbp_get_trash_status_id() )
                 unset( $r['links']['spam'] );
 
             // Trash link shouldn't be visible on spam topics
-            elseif ( $topic_status == $bbp->spam_status_id )
+            elseif ( $topic_status == bbp_get_spam_status_id() )
                 unset( $r['links']['trash'] );
         }
@@ -2187 +2174 @@
      */
     function bbp_get_topic_trash_link( $args = '' ) {
-        global $bbp;
 
         $defaults = array (
@@ -2576 +2562 @@
  */
 function bbp_topic_notices() {
-    global $bbp;
 
     // Bail if not viewing a topic
@@ -2589 +2574 @@
 
         // Spam notice
-        case $bbp->spam_status_id :
+        case bbp_get_spam_status_id() :
             $notice_text = __( 'This topic is marked as spam.', 'bbpress' );
             break;
 
         // Trashed notice
-        case $bbp->trash_status_id :
+        case bbp_get_trash_status_id() :
             $notice_text = __( 'This topic is in the trash.',   'bbpress' );
             break;
@@ -3025 +3010 @@
      */
     function bbp_get_topic_tag_description( $args = array() ) {
-        global $bbp;
 
         $defaults = array(
@@ -3145 +3129 @@
      */
     function bbp_get_form_topic_tags() {
-        global $post, $bbp;
+        global $post;
 
         // Get _POST data