Changeset 5758 for trunk/bp-activity/bp-activity-screens.php

Timestamp:

02/13/2012 05:46:52 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Clean up $bp->current_component, $bp->current_action, and $bp->current_item usage. Fixes #3738.

File:

• trunk/bp-activity/bp-activity-screens.php (modified) (4 diffs)

trunk/bp-activity/bp-activity-screens.php

@@ -191 +191 @@
         return false;
 
-    if ( empty( $bp->current_action ) || !is_numeric( $bp->current_action ) )
+    if ( ! bp_current_action() || !is_numeric( bp_current_action() ) )
         return false;
 
@@ -248 +248 @@
         is_user_logged_in() ?
             bp_core_redirect( bp_loggedin_user_domain() ) :
-            bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . esc_url( bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . $bp->current_action . '/' ) ) );
+            bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . esc_url( bp_get_root_domain() . '/' . bp_get_activity_root_slug() . '/p/' . bp_current_action() . '/' ) ) );
     }
 
@@ -260 +260 @@
  * @since 1.2.0
  *
- * @global object $bp BuddyPress global settings
  * @uses bp_get_user_meta()
  * @uses bp_core_get_username()
@@ -266 +265 @@
  */
 function bp_activity_screen_notification_settings() {
-    global $bp;
 
     if ( !$mention = bp_get_user_meta( bp_displayed_user_id(), 'notification_activity_new_mention', true ) )