Ticket #8892: 8892.2.patch

src/bp-groups/bp-groups-notifications.php

@@ -313 +313 @@
  */
 function groups_notification_group_invites( &$group, &$member, $inviter_user_id ) {
 
-        // @todo $inviter_ud may be used for caching, test without it
-        $inviter_ud      = bp_core_get_core_userdata( $inviter_user_id );
-
         if ( $member instanceof BP_Groups_Member ) {
                 $invited_user_id = $member->user_id;
         } else if ( is_int( $member ) ) {

src/bp-groups/classes/class-bp-groups-component.php

@@ -381 +381 @@
 
                         // Set group type if available.
                         if ( bp_is_current_action( bp_get_groups_group_type_base() ) && bp_action_variable() ) {
-                                $matched_type  = '';
                                 $matched_types = bp_groups_get_group_types(
                                         array(
                                                 'has_directory'  => true,
@@ -766 +765 @@
                         if ( bp_is_item_admin() ) {
                                 // Get the "manage" screens.
                                 $manage_screens    = bp_get_group_screens( 'manage', true );
-                                $admin_link        = bp_get_group_url(
-                                        $this->current_group,
-                                        array(
-                                                'single_item_action' => bp_rewrites_get_slug( 'groups', 'bp_group_read_admin', 'admin' ),
-                                        )
-                                );
 
                                 // Common params to all nav items.
                                 $default_params = array(

src/bp-groups/classes/class-bp-groups-list-table.php

@@ -85 +85 @@
 
                 // Option defaults.
                 $include_id   = false;
-                $search_terms = false;
 
                 // Set current page.
                 $page = $this->get_pagenum();
@@ -120 +119 @@
 
                 // Are we doing a search?
                 if ( ! empty( $_REQUEST['s'] ) ) {
-                        $search_terms = $_REQUEST['s'];
-
+                        
                         // Set the view as a search request.
                         $this->view = 'search';
                 }

src/bp-members/bp-members-activity.php

@@ -240 +240 @@
         }
 
         // Add the activity.
-        $activity_id = bp_activity_add(
+        bp_activity_add(
                 array(
                         'user_id'       => $user_id,
                         'component'     => $bp->members->id,

src/bp-members/screens/activate.php

@@ -44 +44 @@
                 bp_core_redirect( $redirect_to );
         }
 
-        // Get BuddyPress.
-        $bp = buddypress();
-
         /**
          * Filters the template to load for the Member activation page screen.
          *
@@ -85 +82 @@
                 return;
         }
 
-        $bp       = buddypress();
         $redirect = bp_get_activation_page();
 
         /**

src/bp-xprofile/classes/class-bp-xprofile-field-type-checkbox-acceptance.php

@@ -86 +86 @@
          */
         public function edit_field_html( array $raw_properties = array() ) {
                 $user_id   = bp_displayed_user_id();
-                $required  = false;
                 $default_r = array();
 
                 if ( isset( $raw_properties['user_id'] ) ) {
@@ -96 +95 @@
 
                 if ( bp_get_the_profile_field_is_required() ) {
                         $default_r['required'] = 'required'; // HTML5 required attribute.
-                        $required              = true;
                 }
 
                 $r = bp_parse_args(