Changeset 3758 for branches/plugin/bbp-includes/bbp-forum-template.php

Timestamp:

02/25/2012 08:50:27 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Turn bbPress into a singleton.

• Introduce bbpress() function to get the bbPress instance
• Replace all $bbp global references with calls to bbpress()
• Update bbPress class with matching singleton private static $instance variable and public static method
• Fixes #1759.

File:

• branches/plugin/bbp-includes/bbp-forum-template.php (modified) (11 diffs)

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

@@ -32 +32 @@
      */
     function bbp_get_forum_post_type() {
-        global $bbp;
-
-        return apply_filters( 'bbp_get_forum_post_type', $bbp->forum_post_type );
+        return apply_filters( 'bbp_get_forum_post_type', bbpress()->forum_post_type );
     }
 
@@ -59 +57 @@
  */
 function bbp_has_forums( $args = '' ) {
-    global $bbp;
+    $bbp = bbpress();
 
     // Setup possible post__not_in array
@@ -115 +113 @@
  */
 function bbp_forums() {
-    global $bbp;
 
     // Put into variable to check against next
-    $have_posts = $bbp->forum_query->have_posts();
+    $have_posts = bbpress()->forum_query->have_posts();
 
     // Reset the post data when finished
@@ -136 +133 @@
  */
 function bbp_the_forum() {
-    global $bbp;
-    return $bbp->forum_query->the_post();
+    return bbpress()->forum_query->the_post();
 }
 
@@ -171 +167 @@
      */
     function bbp_get_forum_id( $forum_id = 0 ) {
-        global $bbp, $wp_query;
+        global $wp_query;
+
+        $bbp = bbpress();
 
         // Easy empty checking
@@ -329 +327 @@
      * @since bbPress (r3249)
      *
-     * @global bbPress $bbp The main bbPress class
      * @param string $title Default text to use as title
      *
@@ -342 +339 @@
      */
     function bbp_get_forum_archive_title( $title = '' ) {
-        global $bbp;
 
         // If no title was passed
@@ -348 +344 @@
 
             // Set root text to page title
-            $page = bbp_get_page_by_path( $bbp->root_slug );
+            $page = bbp_get_page_by_path( bbpress()->root_slug );
             if ( !empty( $page ) ) {
                 $title = get_the_title( $page->ID );
@@ -1759 +1755 @@
      */
     function bbp_get_forum_class( $forum_id = 0 ) {
-        global $bbp;
-
+        $bbp       = bbpress();
         $forum_id  = bbp_get_forum_id( $forum_id );
         $count     = isset( $bbp->forum_query->current_post ) ? $bbp->forum_query->current_post : 1;
@@ -2052 +2047 @@
      */
     function bbp_get_form_forum_visibility() {
-        global $bbp;
 
         // Get _POST data
@@ -2064 +2058 @@
         // No data
         else
-            $forum_visibility = $bbp->public_status_id;
+            $forum_visibility = bbpress()->public_status_id;
 
         return apply_filters( 'bbp_get_form_forum_visibility', esc_attr( $forum_visibility ) );