Changeset 9471 for trunk/src/bp-forums/bp-forums-template.php

Timestamp:

02/10/2015 02:49:16 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Replace all remaining $bp global touches with buddypress().

All existing tests continue to pass as normal. I will further manually scrutinize each replacement to ensure correctness.

Fixes #5138. Any stragglers or updates will reference this ticket.

File:

• trunk/src/bp-forums/bp-forums-template.php (modified) (19 diffs)

trunk/src/bp-forums/bp-forums-template.php

@@ -28 +28 @@
          */
         function bp_get_forums_slug() {
-                global $bp;
-
                 /**
                  * Filters the forums component slug.
@@ -37 +35 @@
                  * @param string $slug Forums component slug.
                  */
-                return apply_filters( 'bp_get_forums_slug', $bp->forums->slug );
+                return apply_filters( 'bp_get_forums_slug', buddypress()->forums->slug );
         }
 
@@ -58 +56 @@
          */
         function bp_get_forums_root_slug() {
-                global $bp;
-
                 /**
                  * Filters the forums component root slug.
@@ -67 +63 @@
                  * @param string $root_slug Forums component root slug.
                  */
-                return apply_filters( 'bp_get_forums_root_slug', $bp->forums->root_slug );
+                return apply_filters( 'bp_get_forums_root_slug', buddypress()->forums->root_slug );
         }
 
@@ -231 +227 @@
          */
         function __construct( $type, $forum_id, $user_id, $page, $per_page, $max, $no_stickies, $search_terms, $offset = false, $number = false ) {
-                global $bp;
+                $bp = buddypress();
 
                 $this->pag_page     = $page;
@@ -333 +329 @@
                  * @param string $no_stickies Requested sticky format.
                  */
-                $this->topic_count       = apply_filters_ref_array( 'bp_forums_template_topic_count',                                 array( $this->topic_count, &$this->topics, $type, $forum_id, $per_page, $max, $no_stickies ) );
+                $this->topic_count = apply_filters_ref_array( 'bp_forums_template_topic_count', array( $this->topic_count, &$this->topics, $type, $forum_id, $per_page, $max, $no_stickies ) );
 
                 /**
@@ -499 +495 @@
  */
 function bp_has_forum_topics( $args = '' ) {
-        global $forum_template, $bp;
+        global $forum_template;
+
+        $bp = buddypress();
 
         /***
@@ -1666 +1664 @@
          */
         function bp_get_my_forum_topics_link() {
-                global $bp;
-
                 /**
                  * Filters the permalink to the 'personal' topics tab.
@@ -1690 +1686 @@
          */
         function bp_get_unreplied_forum_topics_link() {
-                global $bp;
-
                 /**
                  * Filters the permalink to the 'unreplied' topics tab.
@@ -1714 +1708 @@
          */
         function bp_get_popular_forum_topics_link() {
-                global $bp;
-
                 /**
                  * Filters the permalink to the 'popular' topics tab.
@@ -1738 +1730 @@
          */
         function bp_get_newest_forum_topics_link() {
-                global $bp;
-
                 /**
                  * Filters the link to the forums directory.
@@ -1764 +1754 @@
          */
         function bp_get_forum_topic_type() {
-                global $bp;
 
                 if ( !bp_is_directory() || !bp_current_action() )
@@ -1879 +1868 @@
          */
         function bp_get_forum_pagination_count() {
-                global $bp, $forum_template;
+                global $forum_template;
 
                 $start_num  = intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1;
@@ -1909 +1898 @@
  */
 function bp_is_edit_topic() {
-        global $bp;
 
         if ( bp_is_action_variable( 'post' ) && bp_is_action_variable( 'edit' ) )
@@ -2061 +2049 @@
          */
         function __construct( $topic_id, $per_page, $max, $order ) {
-                global $bp, $current_user, $forum_template;
-
-                if ( !isset( $forum_template ) ) {
-                        $forum_template = new stdClass;
-                }
+                global $forum_template;
+
+                if ( !isset( $forum_template ) ) {
+                        $forum_template = new stdClass;
+                }
 
                 $this->pag_page        = isset( $_REQUEST['topic_page'] ) ? intval( $_REQUEST['topic_page'] ) : 1;
@@ -2193 +2181 @@
          */
         function the_post() {
-                global $post;
 
                 $this->in_the_loop = true;
@@ -2516 +2503 @@
          */
         function bp_get_the_topic_post_is_mine() {
-                global $bp, $topic_template;
+                global $topic_template;
 
                 return bp_loggedin_user_id() == $topic_template->post->poster_id;
@@ -2629 +2616 @@
  */
 function bp_the_topic_pagination_count() {
-        global $bp, $topic_template;
+        global $topic_template;
 
         $start_num = intval( ( $topic_template->pag_page - 1 ) * $topic_template->pag_num ) + 1;
@@ -2758 +2745 @@
          */
         function bp_get_forum_name( $forum_id = 0 ) {
-                global $bp;
 
                 if ( empty( $forum_id ) ) {