Changeset 8607 for trunk/src/bp-core/bp-core-classes.php

Timestamp:

07/12/2014 01:54:46 AM (10 years ago)

Author:

boonebgorges

Message:

block_self should not block all buttons when inside a members loop on one's own profile

This changeset reconfigures the block_self logic in BP_Button so that the
bp_is_my_profile() check is skipped when inside of a members loop. This allows
block_self logic to operate properly when inside of a members loop that happens
to appear on the logged-in user's profile page.

Also adds unit tests for the block_self param.

Fixes #5734

Props r-a-y for the initial patch.

File:

• trunk/src/bp-core/bp-core-classes.php (modified) (1 diff)

trunk/src/bp-core/bp-core-classes.php

@@ -1892 +1892 @@
             return false;
 
-        // No button if viewing your own profile
-        if ( true == $this->block_self && bp_is_my_profile() )
-            return false;
-
-        // No button if you are the current user in a loop
-        if ( true === $this->block_self && is_user_logged_in() && bp_loggedin_user_id() === bp_get_member_user_id() )
-            return false;
+        // block_self
+        if ( true == $this->block_self ) {
+            // No button if you are the current user in a members loop
+            // This condition takes precedence, because members loops
+            // can be found on user profiles
+            if ( bp_get_member_user_id() ) {
+                if ( is_user_logged_in() && bp_loggedin_user_id() == bp_get_member_user_id() ) {
+                    return false;
+                }
+
+            // No button if viewing your own profile (and not in
+            // a members loop)
+            } else if ( bp_is_my_profile() ) {
+                return false;
+            }
+        }
 
         // Wrapper properties