Ticket #6331: 6331.suggestions.patch

src/bp-messages/bp-messages-star.php

@@ -84 +84 @@
          *                                       Only applicable if $message_id is set and if $url_only is false.
          *     @type string $title_star_thread   Link title for the 'star' action when displayed in a thread loop.
          *                                       Only applicable if $message_id is set and if $url_only is false.
-         }
+         * }
          * @return string
          */
         function bp_get_the_message_star_action_link( $args = array() ) {
@@ -356 +356 @@
                 wp_die( "Oops!  That's a no-no!" );
         }
 
+        // Check capability
+        if ( ! is_user_logged_in() || ( ! bp_is_my_profile() && ! bp_current_user_can( 'bp_moderate' ) ) ) {
+                return;
+        }
+
         // mark the star
         bp_messages_star_set_action( array(
                 'action'     => bp_current_action(),
@@ -385 +390 @@
                 return;
         }
 
+        // Check capability
+        if ( ! is_user_logged_in() || ( ! bp_is_my_profile() && ! bp_current_user_can( 'bp_moderate' ) ) ) {
+                return;
+        }
+
         $action  = ! empty( $_POST['messages_bulk_action'] ) ? $_POST['messages_bulk_action'] : '';
         $threads = ! empty( $_POST['message_ids'] ) ? $_POST['message_ids'] : '';
         $threads = wp_parse_id_list( $threads );
@@ -448 +458 @@
                 return;
         }
 
-        wp_enqueue_style( 'dashicons' );
+        /**
+         * Use this filter to use your theme icon stylesheet as soon as it's already
+         * registered (see wp_register_style())
+         *
+         * eg: genericons
+         *
+         * @since  BuddyPress (2.3.0)
+         *
+         * @param  string the stylesheet handler
+         */
+        wp_enqueue_style( apply_filters( 'bp_messages_star_icons_stylesheet', 'dashicons' ) );
 }
-add_action( 'wp_enqueue_scripts', 'bp_messages_star_enqueue_scripts' );
+add_action( 'bp_enqueue_scripts', 'bp_messages_star_enqueue_scripts' );
 
 /**
  * Add the "Add star" and "Remove star" options to the bulk management list.

src/bp-templates/bp-legacy/buddypress-functions.php

@@ -1713 +1713 @@
                 return;
         }
 
+        // Check nonce
         check_ajax_referer( 'bp-messages-star-' . (int) $_POST['message_id'], 'nonce' );
 
+        // Check capability
+        if ( ! is_user_logged_in() || ( ! bp_is_my_profile() && ! bp_current_user_can( 'bp_moderate' ) ) ) {
+                return;
+        }
+
         if ( true === bp_messages_star_set_action( array(
                 'action'     => $_POST['star_status'],
                 'message_id' => (int) $_POST['message_id'],

tests/phpunit/testcases/core/functions.php

@@ -598 +598 @@
                         date_default_timezone_set( $tz_backup );
                 }
         }
+
+        /**
+         * @group bp_is_active
+         */
+        public function test_bp_is_active_component() {
+                $bp = buddypress();
+                $reset_active_components = $bp->active_components;
+
+                $this->assertTrue( bp_is_active( 'members' ) );
+
+                $this->assertFalse( bp_is_active( 'foo' ) );
+
+                // Create and activate the foo component
+                $bp->foo = new BP_Component;
+                $bp->foo->id   = 'foo';
+                $bp->foo->slug = 'foo';
+                $bp->foo->name = 'Foo';
+                $bp->active_components[ $bp->foo->id ] = 1;
+
+                $this->assertTrue( bp_is_active( 'foo' ) );
+
+                add_filter( 'bp_is_active', '__return_false' );
+
+                $this->assertFalse( bp_is_active( 'foo' ) );
+
+                remove_filter( 'bp_is_active', '__return_false' );
+
+                // Reset buddypress() vars
+                $bp->active_components = $reset_active_components;
+        }
+
+        /**
+         * @group bp_is_active
+         */
+        public function test_bp_is_active_feature() {
+                $bp = buddypress();
+                $reset_active_components = $bp->active_components;
+
+                $this->assertTrue( bp_is_active( 'messages', 'star' ) );
+
+                add_filter( 'bp_is_messages_star_active', '__return_false' );
+
+                $this->assertFalse( bp_is_active( 'messages', 'star' ) );
+
+                remove_filter( 'bp_is_messages_star_active', '__return_false' );
+
+                add_filter( 'bp_is_active', '__return_false' );
+
+                $this->assertFalse( bp_is_active( 'messages', 'star' ) );
+
+                remove_filter( 'bp_is_active', '__return_false' );
+
+                $this->assertFalse( bp_is_active( 'foo', 'bar' ) );
+
+                // Create and activate the foo component
+                $bp->foo = new BP_Component;
+                $bp->foo->id   = 'foo';
+                $bp->foo->slug = 'foo';
+                $bp->foo->name = 'Foo';
+                $bp->active_components[ $bp->foo->id ] = 1;
+
+                $this->assertTrue( bp_is_active( 'foo', 'bar' ) );
+
+                add_filter( 'bp_is_foo_bar_active', '__return_false' );
+
+                $this->assertFalse( bp_is_active( 'foo', 'bar' ) );
+
+                remove_filter( 'bp_is_foo_bar_active', '__return_false' );
+
+                add_filter( 'bp_is_active', '__return_false' );
+
+                $this->assertFalse( bp_is_active( 'foo', 'bar' ) );
+
+                remove_filter( 'bp_is_active', '__return_false' );
+
+                // Reset buddypress() vars
+                $bp->active_components = $reset_active_components;
+        }
 }