Changeset 8783 for trunk/src/bp-activity/bp-activity-functions.php

Timestamp:

08/10/2014 06:24:02 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Replace $bp globals with buddypress() calls in bp-activity-functions.php.

File:

• trunk/src/bp-activity/bp-activity-functions.php (modified) (6 diffs)

trunk/src/bp-activity/bp-activity-functions.php

@@ -1798 +1798 @@
  * @since BuddyPress (1.6.0)
  *
- * @global object $bp BuddyPress global settings.
- *
  * @param BP_Activity_Activity $activity The activity item to be spammed.
  * @param string $source Optional. Default is "by_a_person" (ie, a person has
@@ -1806 +1804 @@
  */
 function bp_activity_mark_as_spam( &$activity, $source = 'by_a_person' ) {
-    global $bp;
+    $bp = buddypress();
 
     $activity->is_spam = 1;
@@ -1837 +1835 @@
  *
  * @since BuddyPress (1.6.0)
- *
- * @global object $bp BuddyPress global settings.
  *
  * @param BP_Activity_Activity $activity The activity item to be hammed.
@@ -1846 +1842 @@
  */
 function bp_activity_mark_as_ham( &$activity, $source = 'by_a_person' ) {
-    global $bp;
+    $bp = buddypress();
 
     $activity->is_spam = 0;
@@ -1932 +1928 @@
  *
  * @see BP_Embed
- * @global object $bp BuddyPress global settings
  * @uses add_filter() To attach create_function() to 'embed_post_id'.
  * @uses add_filter() To attach 'bp_embed_activity_cache' to 'bp_embed_get_cache'.
@@ -1940 +1935 @@
  */
 function bp_dtheme_embed_read_more( $activity ) {
-    global $bp;
-
-    $bp->activity->read_more_id = $activity->id;
-
-    add_filter( 'embed_post_id',            create_function( '', 'global $bp; return $bp->activity->read_more_id;' ) );
-    add_filter( 'bp_embed_get_cache',       'bp_embed_activity_cache',      10, 3 );
-    add_action( 'bp_embed_update_cache',    'bp_embed_activity_save_cache', 10, 3 );
-}
-add_action( 'bp_dtheme_get_single_activity_content', 'bp_dtheme_embed_read_more' );
+    buddypress()->activity->read_more_id = $activity->id;
+
+    add_filter( 'embed_post_id',         create_function( '', 'return buddypress()->activity->read_more_id;' ) );
+    add_filter( 'bp_embed_get_cache',    'bp_embed_activity_cache',      10, 3 );
+    add_action( 'bp_embed_update_cache', 'bp_embed_activity_save_cache', 10, 3 );
+}
+add_action( 'bp_dtheme_get_single_activity_content',       'bp_dtheme_embed_read_more' );
 add_action( 'bp_legacy_theme_get_single_activity_content', 'bp_dtheme_embed_read_more' );