Changeset 5687 for trunk/bp-groups/bp-groups-screens.php

Timestamp:

02/09/2012 11:00:59 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Audit the usage of $bp->is_item_admin and $bp->is_item_mod to use the _is_ functions isntead. Also fix some $bp globals in the process. See #3989.

File:

• trunk/bp-groups/bp-groups-screens.php (modified) (14 diffs)

trunk/bp-groups/bp-groups-screens.php

@@ -168 +168 @@
 
             // Sticky a topic
-            else if ( bp_is_action_variable( 'stick', 2 ) && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) {
+            else if ( bp_is_action_variable( 'stick', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
                 // Check the nonce
                 check_admin_referer( 'bp_forums_stick_topic' );
@@ -182 +182 @@
 
             // Un-Sticky a topic
-            else if ( bp_is_action_variable( 'unstick', 2 ) && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) {
+            else if ( bp_is_action_variable( 'unstick', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
                 // Check the nonce
                 check_admin_referer( 'bp_forums_unstick_topic' );
@@ -196 +196 @@
 
             // Close a topic
-            else if ( bp_is_action_variable( 'close', 2 ) && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) {
+            else if ( bp_is_action_variable( 'close', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
                 // Check the nonce
                 check_admin_referer( 'bp_forums_close_topic' );
@@ -210 +210 @@
 
             // Open a topic
-            else if ( bp_is_action_variable( 'open', 2 ) && ( isset( $bp->is_item_admin ) || isset( $bp->is_item_mod ) ) ) {
+            else if ( bp_is_action_variable( 'open', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
                 // Check the nonce
                 check_admin_referer( 'bp_forums_open_topic' );
@@ -229 +229 @@
 
                 /* Check the logged in user can delete this topic */
-                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)bp_loggedin_user_id() != (int)$topic->topic_poster )
+                if ( ! bp_is_item_admin() && ! bp_is_item_mod() && ( (int) bp_loggedin_user_id() != (int) $topic->topic_poster ) )
                     bp_core_redirect( wp_get_referer() );
 
@@ -252 +252 @@
 
                 // Check the logged in user can edit this topic
-                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)bp_loggedin_user_id() != (int)$topic->topic_poster )
+                if ( ! bp_is_item_admin() && ! bp_is_item_mod() && ( (int) bp_loggedin_user_id() != (int) $topic->topic_poster ) )
                     bp_core_redirect( wp_get_referer() );
 
@@ -279 +279 @@
 
                 // Check the logged in user can edit this topic
-                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)bp_loggedin_user_id() != (int)$post->poster_id )
+                if ( ! bp_is_item_admin() && ! bp_is_item_mod() && ( (int) bp_loggedin_user_id() != (int) $post->poster_id ) )
                     bp_core_redirect( wp_get_referer() );
 
@@ -302 +302 @@
 
                 // Check the logged in user can edit this topic
-                if ( !$bp->is_item_admin && !$bp->is_item_mod && (int)bp_loggedin_user_id() != (int)$post->poster_id )
+                if ( ! bp_is_item_admin() && ! bp_is_item_mod() && ( (int) bp_loggedin_user_id() != (int) $post->poster_id ) )
                     bp_core_redirect( wp_get_referer() );
 
@@ -481 +481 @@
     if ( bp_is_groups_component() && bp_is_action_variable( 'edit-details', 0 ) ) {
 
-        if ( $bp->is_item_admin || $bp->is_item_mod  ) {
+        if ( bp_is_item_admin() || bp_is_item_mod() ) {
 
             // If the edit form has been submitted, save the edited details
@@ -513 +513 @@
     if ( bp_is_groups_component() && bp_is_action_variable( 'group-settings', 0 ) ) {
 
-        if ( !$bp->is_item_admin )
+        if ( ! bp_is_item_admin() )
             return false;
 
@@ -556 +556 @@
 
         // If the logged-in user doesn't have permission or if avatar uploads are disabled, then stop here
-        if ( !$bp->is_item_admin || (int)bp_get_option( 'bp-disable-avatar-uploads' ) )
+        if ( ! bp_is_item_admin() || (int) bp_get_option( 'bp-disable-avatar-uploads' ) )
             return false;
 
@@ -619 +619 @@
     if ( bp_is_groups_component() && bp_is_action_variable( 'manage-members', 0 ) ) {
 
-        if ( !$bp->is_item_admin )
+        if ( ! bp_is_item_admin() )
             return false;
 
@@ -734 +734 @@
     if ( bp_is_groups_component() && bp_is_action_variable( 'membership-requests', 0 ) ) {
 
-        if ( !$bp->is_item_admin || 'public' == $bp->groups->current_group->status )
+        if ( ! bp_is_item_admin() || ( 'public' == $bp->groups->current_group->status ) )
             return false;
 
@@ -783 +783 @@
     if ( bp_is_groups_component() && bp_is_action_variable( 'delete-group', 0 ) ) {
 
-        if ( !$bp->is_item_admin && !bp_current_user_can( 'bp_moderate' ) )
+        if ( ! bp_is_item_admin() && !bp_current_user_can( 'bp_moderate' ) )
             return false;