Changeset 4842 for trunk/bp-messages/bp-messages-screens.php

Timestamp:

07/24/2011 10:51:38 PM (15 years ago)

Author:

boonebgorges

Message:

Global/slug review in Settings and Messages component. See #3325

File:

• trunk/bp-messages/bp-messages-screens.php (modified) (8 diffs)

trunk/bp-messages/bp-messages-screens.php

@@ -12 +12 @@
         global $bp;
 
-        if ( !empty( $bp->action_variables ) ) {
+        if ( bp_action_variables() ) {
                 bp_do_404();
                 return;
@@ -24 +24 @@
         global $bp;
 
-        if ( !empty( $bp->action_variables ) ) {
+        if ( bp_action_variables() ) {
                 bp_do_404();
                 return;
@@ -36 +36 @@
         global $bp;
 
-        if ( !empty( $bp->action_variables ) ) {
+        if ( bp_action_variables() ) {
                 bp_do_404();
                 return;
@@ -86 +86 @@
 
 function messages_screen_notices() {
-        global $bp, $notice_id;
+        global $notice_id;
 
         if ( !is_super_admin() )
                 return false;
 
-        $notice_id = isset( $bp->action_variables[1] ) ? $bp->action_variables[1] : 0;
-
+        $notice_id = (int)bp_action_variable( 1 );
+        
         if ( !empty( $notice_id ) && is_numeric( $notice_id ) ) {
                 $notice = new BP_Messages_Notice( $notice_id );
 
-                if ( 'deactivate' == $bp->action_variables[0] ) {
+                if ( bp_is_action_variable( 'deactivate', 0 ) ) {
                         if ( !$notice->deactivate() ) {
                                 bp_core_add_message( __('There was a problem deactivating that notice.', 'buddypress'), 'error' );
@@ -102 +102 @@
                                 bp_core_add_message( __('Notice deactivated.', 'buddypress') );
                         }
-                } else if ( 'activate' == $bp->action_variables[0] ) {
+                } else if ( bp_is_action_variable( 'activate', 0 ) ) {
                         if ( !$notice->activate() ) {
                                 bp_core_add_message( __('There was a problem activating that notice.', 'buddypress'), 'error' );
@@ -108 +108 @@
                                 bp_core_add_message( __('Notice activated.', 'buddypress') );
                         }
-                } else if ( 'delete' == $bp->action_variables[0] ) {
+                } else if ( bp_is_action_variable( 'delete' ) ) {
                         if ( !$notice->delete() ) {
                                 bp_core_add_message( __('There was a problem deleting that notice.', 'buddypress'), 'buddypress' );
@@ -115 +115 @@
                         }
                 }
-                bp_core_redirect( $bp->loggedin_user->domain . $bp->messages->slug . '/notices' );
+                bp_core_redirect( bp_loggedin_user_domain() . bp_get_messages_slug() . '/notices' );
         }
 
-        if ( !empty( $bp->action_variables ) ) {
+        if ( bp_action_variables() ) {
                 bp_do_404();
                 return;
@@ -131 +131 @@
         global $bp;
 
-        if ( !empty( $bp->action_variables ) ) {
+        if ( bp_action_variables() ) {
                 bp_do_404();
                 return;