Changeset 5706 for trunk/bp-themes/bp-default/_inc/ajax.php

Timestamp:

02/11/2012 03:25:01 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Remove unused $bp globals from bp-default's ajax.php. See #3989.

File:

• trunk/bp-themes/bp-default/_inc/ajax.php (modified) (15 diffs)

trunk/bp-themes/bp-default/_inc/ajax.php

@@ -1 +1 @@
 <?php
+
 /***
  * AJAX Functions
@@ -107 +108 @@
 // This function will load the activity loop template when activity is requested via AJAX
 function bp_dtheme_activity_template_loader() {
-    global $bp;
 
     $scope = '';
@@ -147 +147 @@
 /* AJAX update posting */
 function bp_dtheme_post_update() {
-    global $bp;
 
     // Check the nonce
@@ -189 +188 @@
 /* AJAX activity comment posting */
 function bp_dtheme_new_activity_comment() {
-    global $bp;
 
     // Check the nonce
@@ -246 +244 @@
 /* AJAX delete an activity */
 function bp_dtheme_delete_activity() {
-    global $bp;
 
     // Check the nonce
@@ -285 +282 @@
 /* AJAX delete an activity comment */
 function bp_dtheme_delete_activity_comment() {
-    global $bp;
-
-    /* Check the nonce */
+
+    // Check the nonce
     check_admin_referer( 'bp_activity_delete_link' );
 
@@ -368 +364 @@
 /* AJAX mark an activity as a favorite */
 function bp_dtheme_mark_activity_favorite() {
-    global $bp;
 
     bp_activity_add_user_favorite( $_POST['id'] );
@@ -377 +372 @@
 /* AJAX mark an activity as not a favorite */
 function bp_dtheme_unmark_activity_favorite() {
-    global $bp;
 
     bp_activity_remove_user_favorite( $_POST['id'] );
@@ -414 +408 @@
 /* AJAX invite a friend to a group functionality */
 function bp_dtheme_ajax_invite_user() {
-    global $bp;
 
     check_ajax_referer( 'groups_invite_uninvite_user' );
@@ -458 +451 @@
 /* AJAX add/remove a user as a friend when clicking the button */
 function bp_dtheme_ajax_addremove_friend() {
-    global $bp;
 
     if ( 'is_friend' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), $_POST['fid'] ) ) {
@@ -511 +503 @@
 /* AJAX join or leave a group when clicking the "join/leave" button */
 function bp_dtheme_ajax_joinleave_group() {
-    global $bp;
 
     if ( groups_is_user_banned( bp_loggedin_user_id(), $_POST['gid'] ) )
@@ -613 +604 @@
 /* AJAX mark a private message as unread in your inbox */
 function bp_dtheme_ajax_message_markunread() {
-    global $bp;
 
     if ( !isset($_POST['thread_ids']) ) {
@@ -629 +619 @@
 /* AJAX mark a private message as read in your inbox */
 function bp_dtheme_ajax_message_markread() {
-    global $bp;
 
     if ( !isset($_POST['thread_ids']) ) {
@@ -645 +634 @@
 /* AJAX delete a private message or array of messages in your inbox */
 function bp_dtheme_ajax_messages_delete() {
-    global $bp;
 
     if ( !isset($_POST['thread_ids']) ) {
@@ -672 +660 @@
 
     // Include everyone in the autocomplete, or just friends?
-    if ( $bp->messages->slug == $bp->current_component )
+    if ( bp_is_current_component( bp_get_messages_slug() ) )
         $autocomplete_all = $bp->messages->autocomplete_all;
 
-    $friends  = false;
     $pag_page = 1;