Changeset 12930 for trunk/src/bp-members/classes/class-bp-members-invitations-template.php

Timestamp:

04/29/2021 08:31:02 AM (5 years ago)

Author:

imath

Message:

Member Invites: add missing /* translators: */ inline comments

This commit also:

• adds some tiny improvements to get along with WP Coding Standards,
• removes a forgotten PHP notice using the right $args variable instead of the undefined $all_args one in bp_members_invitations_get_registration_welcome_message()
• removes an extra <hr class="wp-header-end"> into the Manage Invitations Admin screen that was causing admin notices to appear twice.
• Uses the wpautop() function instead of an inexisting wpautop filter into bp_members_invitations_add_legacy_welcome_message() and bp_members_invitations_add_legacy_registration_disabled_message().

Huge Props dcavins for this awesome new feature!

See #8139

File:

• trunk/src/bp-members/classes/class-bp-members-invitations-template.php (modified) (4 diffs)

trunk/src/bp-members/classes/class-bp-members-invitations-template.php

@@ -163 +163 @@
 
                 // Parse arguments.
-                $r = wp_parse_args( $args, array(
-                        'id'                => false,
-                        'user_id'           => false,
-                        'inviter_id'        => false,
-                        'invitee_email'     => false,
-                        'item_id'           => false,
-                        'type'              => 'invite',
-                        'invite_sent'       => 'all',
-                        'accepted'          => 'all',
-                        'search_terms'      => '',
-                        'order_by'          => 'date_modified',
-                        'sort_order'        => 'DESC',
-                        'page'              => 1,
-                        'per_page'          => 25,
-                        'fields'            => 'all',
-                        'page_arg'          => 'ipage',
-                ) );
+                $r = wp_parse_args(
+                        $args,
+                        array(
+                                'id'            => false,
+                                'user_id'       => false,
+                                'inviter_id'    => false,
+                                'invitee_email' => false,
+                                'item_id'       => false,
+                                'type'          => 'invite',
+                                'invite_sent'   => 'all',
+                                'accepted'      => 'all',
+                                'search_terms'  => '',
+                                'order_by'      => 'date_modified',
+                                'sort_order'    => 'DESC',
+                                'page'          => 1,
+                                'per_page'      => 25,
+                                'fields'        => 'all',
+                                'page_arg'      => 'ipage',
+                        )
+                );
 
                 // Sort order direction.
@@ -191 +194 @@
                 // Setup variables.
                 $this->pag_arg      = sanitize_key( $r['page_arg'] );
-                $this->pag_page     = bp_sanitize_pagination_arg( $this->pag_arg, $r['page']     );
-                $this->pag_num      = bp_sanitize_pagination_arg( 'num',          $r['per_page'] );
+                $this->pag_page     = bp_sanitize_pagination_arg( $this->pag_arg, $r['page'] );
+                $this->pag_num      = bp_sanitize_pagination_arg( 'num', $r['per_page'] );
                 $this->user_id      = $r['user_id'];
                 $this->search_terms = $r['search_terms'];
@@ -198 +201 @@
                 $this->sort_order   = $r['sort_order'];
                 $this->query_vars   = array(
-                        'id'                => $r['id'],
-                        'user_id'           => $r['user_id'],
-                        'inviter_id'        => $r['inviter_id'],
-                        'invitee_email'     => $r['invitee_email'],
-                        'item_id'           => $r['item_id'],
-                        'type'              => $r['type'],
-                        'invite_sent'       => $r['invite_sent'],
-                        'accepted'          => $r['accepted'],
-                        'search_terms'      => $this->search_terms,
-                        'order_by'          => $this->order_by,
-                        'sort_order'        => $this->sort_order,
-                        'page'              => $this->pag_page,
-                        'per_page'          => $this->pag_num,
+                        'id'            => $r['id'],
+                        'user_id'       => $r['user_id'],
+                        'inviter_id'    => $r['inviter_id'],
+                        'invitee_email' => $r['invitee_email'],
+                        'item_id'       => $r['item_id'],
+                        'type'          => $r['type'],
+                        'invite_sent'   => $r['invite_sent'],
+                        'accepted'      => $r['accepted'],
+                        'search_terms'  => $this->search_terms,
+                        'order_by'      => $this->order_by,
+                        'sort_order'    => $this->sort_order,
+                        'page'          => $this->pag_page,
+                        'per_page'      => $this->pag_num,
                 );
 
@@ -225 +228 @@
                         );
 
-                        $this->pag_links = paginate_links( array(
-                                'base'      => add_query_arg( $this->pag_arg, '%#%' ),
-                                'format'    => '',
-                                'total'     => ceil( (int) $this->total_invitation_count / (int) $this->pag_num ),
-                                'current'   => $this->pag_page,
-                                'prev_text' => _x( '←', 'Network invitation pagination previous text', 'buddypress' ),
-                                'next_text' => _x( '→', 'Network invitation pagination next text',     'buddypress' ),
-                                'mid_size'  => 1,
-                                'add_args'  => $add_args,
-                        ) );
+                        $this->pag_links = paginate_links(
+                                array(
+                                        'base'      => add_query_arg( $this->pag_arg, '%#%' ),
+                                        'format'    => '',
+                                        'total'     => ceil( (int) $this->total_invitation_count / (int) $this->pag_num ),
+                                        'current'   => $this->pag_page,
+                                        'prev_text' => _x( '←', 'Network invitation pagination previous text', 'buddypress' ),
+                                        'next_text' => _x( '→', 'Network invitation pagination next text', 'buddypress' ),
+                                        'mid_size'  => 1,
+                                        'add_args'  => $add_args,
+                                )
+                        );
                 }
         }