Changeset 5684 for trunk/bp-activity/bp-activity-actions.php

Timestamp:

02/09/2012 10:10:47 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in Activity component. See #3989.

File:

• trunk/bp-activity/bp-activity-actions.php (modified) (18 diffs)

trunk/bp-activity/bp-activity-actions.php

@@ -115 +115 @@
  * @param int $activity_id Activity id to be deleted. Defaults to 0.
  *
- * @global object $bp BuddyPress global settings
  * @uses bp_is_activity_component()
  * @uses bp_is_current_action()
@@ -130 +129 @@
  */
 function bp_activity_action_delete_activity( $activity_id = 0 ) {
-    global $bp;
 
     // Not viewing activity or action is not delete
@@ -347 +345 @@
  * @since 1.2.0
  *
- * @global object $bp BuddyPress global settings
  * @uses is_user_logged_in()
  * @uses bp_is_activity_component()
@@ -361 +358 @@
  */
 function bp_activity_action_mark_favorite() {
-    global $bp;
 
     if ( !is_user_logged_in() || !bp_is_activity_component() || !bp_is_current_action( 'favorite' ) )
@@ -383 +379 @@
  * @since 1.2.0
  *
- * @global object $bp BuddyPress global settings
  * @uses is_user_logged_in()
  * @uses bp_is_activity_component()
@@ -397 +392 @@
  */
 function bp_activity_action_remove_favorite() {
-    global $bp;
 
     if ( !is_user_logged_in() || ( bp_is_activity_component() ) || !bp_is_current_action( 'unfavorite' ) )
@@ -447 +441 @@
  * @since 1.0.0
  *
- * @global object $bp BuddyPress global settings
  * @global object $wp_query
  * @uses bp_is_user_activity()
@@ -456 +449 @@
  */
 function bp_activity_action_personal_feed() {
-    global $bp, $wp_query;
+    global $wp_query;
 
     if ( !bp_is_user_activity() || !bp_is_current_action( 'feed' ) )
@@ -474 +467 @@
  * @since 1.0.0
  *
- * @global object $bp BuddyPress global settings
  * @global object $wp_query
  * @uses bp_is_active()
@@ -486 +478 @@
  */
 function bp_activity_action_friends_feed() {
-    global $bp, $wp_query;
+    global $wp_query;
 
     if ( !bp_is_active( 'friends' ) || !bp_is_user_activity() || !bp_is_current_action( bp_get_friends_slug() ) || !bp_is_action_variable( 'feed', 0 ) )
@@ -504 +496 @@
  * @since 1.2.0
  *
- * @global object $bp BuddyPress global settings
  * @global object $wp_query
  * @uses bp_is_active()
@@ -516 +507 @@
  */
 function bp_activity_action_my_groups_feed() {
-    global $bp, $wp_query;
+    global $wp_query;
 
     if ( !bp_is_active( 'groups' ) || !bp_is_user_activity() || !bp_is_current_action( bp_get_groups_slug() ) || !bp_is_action_variable( 'feed', 0 ) )
@@ -534 +525 @@
  * @since 1.2.0
  *
- * @global object $bp BuddyPress global settings
  * @global object $wp_query
  * @uses bp_is_user_activity()
@@ -544 +534 @@
  */
 function bp_activity_action_mentions_feed() {
-    global $bp, $wp_query;
+    global $wp_query;
 
     if ( !bp_is_user_activity() || !bp_is_current_action( 'mentions' ) || !bp_is_action_variable( 'feed', 0 ) )
@@ -562 +552 @@
  * @since 1.2.0
  *
- * @global object $bp BuddyPress global settings
  * @global object $wp_query
  * @uses bp_is_user_activity()
@@ -572 +561 @@
  */
 function bp_activity_action_favorites_feed() {
-    global $bp, $wp_query;
+    global $wp_query;
 
     if ( !bp_is_user_activity() || !bp_is_current_action( 'favorites' ) || !bp_is_action_variable( 'feed', 0 ) )
@@ -584 +573 @@
 }
 add_action( 'bp_actions', 'bp_activity_action_favorites_feed' );
-
 
 /**
@@ -610 +598 @@
     $bp->activity->akismet = new BP_Akismet();
 }
+
 ?>