Changeset 3505 for branches/plugin/bbp-includes/bbp-forum-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-forum-template.php (modified) (13 diffs)

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

@@ -62 +62 @@
 
     // Setup possible post__not_in array
-    $post_stati[] = 'publish';
+    $post_stati[] = bbp_get_public_status_id();
 
     // Super admin get whitelisted post statuses
     if ( is_super_admin() ) {
-        $post_stati = array( 'publish', 'private', 'hidden' );
+        $post_stati = array( bbp_get_public_status_id(), bbp_get_private_status_id(), bbp_get_hidden_status_id() );
 
     // Not a super admin, so check caps
@@ -73 +73 @@
         // Check if user can read private forums
         if ( current_user_can( 'read_private_forums' ) )
-            $post_stati[] = 'private';
+            $post_stati[] = bbp_get_private_status_id();
 
         // Check if user can read hidden forums
         if ( current_user_can( 'read_hidden_forums' ) )
-            $post_stati[] = 'hidden';
+            $post_stati[] = bbp_get_hidden_status_id();
     }
 
@@ -580 +580 @@
 
     // Setup possible post__not_in array
-    $post_stati[] = 'publish';
+    $post_stati[] = bbp_get_public_status_id();
 
     // Super admin get whitelisted post statuses
     if ( is_super_admin() ) {
-        $post_stati = array( 'publish', 'private', 'hidden' );
+        $post_stati = array( bbp_get_public_status_id(), bbp_get_private_status_id(), bbp_get_hidden_status_id() );
 
     // Not a super admin, so check caps
@@ -591 +591 @@
         // Check if user can read private forums
         if ( current_user_can( 'read_private_forums' ) )
-            $post_stati[] = 'private';
+            $post_stati[] = bbp_get_private_status_id();
 
         // Check if user can read hidden forums
         if ( current_user_can( 'read_hidden_forums' ) )
-            $post_stati[] = 'hidden';
+            $post_stati[] = bbp_get_hidden_status_id();
     }
 
@@ -636 +636 @@
  */
 function bbp_list_forums( $args = '' ) {
-    global $bbp;
 
     // Define used variables
@@ -1077 +1076 @@
      */
     function bbp_get_forum_topics_link( $forum_id = 0 ) {
-        global $bbp;
 
         $forum    = bbp_get_forum( bbp_get_forum_id( (int) $forum_id ) );
@@ -1375 +1373 @@
      */
     function bbp_is_forum_closed( $forum_id = 0, $check_ancestors = true ) {
-        global $bbp;
-
-        $forum_id = bbp_get_forum_id( $forum_id );
-        $retval    = ( $bbp->closed_status_id == bbp_get_forum_status( $forum_id ) );
+
+        $forum_id = bbp_get_forum_id( $forum_id );
+        $retval    = ( bbp_get_closed_status_id() == bbp_get_forum_status( $forum_id ) );
 
         if ( !empty( $check_ancestors ) ) {
@@ -1408 +1405 @@
  */
 function bbp_is_forum_public( $forum_id = 0, $check_ancestors = true ) {
-    global $bbp;
 
     $forum_id   = bbp_get_forum_id( $forum_id );
@@ -1414 +1410 @@
 
     // If post status is public, return true
-    $retval = ( 'publish' == $visibility );
+    $retval = ( bbp_get_public_status_id() == $visibility );
 
     // Check ancestors and inherit their privacy setting for display
@@ -1445 +1441 @@
  */
 function bbp_is_forum_private( $forum_id = 0, $check_ancestors = true ) {
-    global $bbp;
 
     $forum_id   = bbp_get_forum_id( $forum_id );
@@ -1451 +1446 @@
 
     // If post status is private, return true
-    $retval = ( 'private' == $visibility );
+    $retval = ( bbp_get_private_status_id() == $visibility );
 
     // Check ancestors and inherit their privacy setting for display
@@ -1482 +1477 @@
  */
 function bbp_is_forum_hidden( $forum_id = 0, $check_ancestors = true ) {
-    global $bbp;
 
     $forum_id   = bbp_get_forum_id( $forum_id );
@@ -1488 +1482 @@
 
     // If post status is private, return true
-    $retval = ( 'hidden' == $visibility );
+    $retval = ( bbp_get_hidden_status_id() == $visibility );
 
     // Check ancestors and inherit their privacy setting for display