Ticket #7689: 7689.diff

src/bp-templates/bp-nouveau/includes/ajax.php

@@ -87 +87 @@
                 bp_update_is_directory( true, bp_current_component() );
         }
 
-        // The template part can be overridden by the calling JS function.
-        if ( ! empty( $_POST['template'] ) && 'groups/single/members' === $_POST['template'] && 'group_members' === $object ) {
-                $template_part = 'groups/single/members.php';
-        } else {
-                $template_part = $object . '/' . $object . '-loop.php';
+        // Get the template path based on the 'template' variable via the AJAX request.
+        $template = isset( $_POST['template'] ) ? wp_unslash( $_POST['template'] ) : '';
+        switch ( $template ) {
+                case 'group_members' :
+                case 'groups/single/members' :
+                        $template_part = 'groups/single/members-loop.php';
+                break;
+
+                case 'group_requests' :
+                        $template_part = 'groups/single/requests-loop.php';
+                break;
+
+                case 'member_notifications' :
+                        $template_part = 'members/single/notifications/notifications-loop.php';
+                break;
+
+                default :
+                        $template_part = $object . '/' . $object . '-loop.php';
+                break;
         }
 
         ob_start();

src/bp-templates/bp-nouveau/js/buddypress-notifications.js

@@ -100 +100 @@
                                 filter              : filter,
                                 search_terms        : search_terms,
                                 extras              : sort,
-                                page                : 1,
-                                template            : 'members/single/notifications/notifications-loop'
+                                page                : 1
                         } );
                 },
 

src/bp-templates/bp-nouveau/js/buddypress-nouveau.js

@@ -326 +326 @@
 
                         if ( 'friends' === data.object || 'group_members' === data.object ) {
                                 data.object = 'members';
+                                data.template = data.object;
                         } else if ( 'group_requests' === data.object ) {
                                 data.object = 'groups';
+                                data.template = 'group_requests';
+                        } else if ( 'notifications' === data.object ) {
+                                data.object = 'members';
+                                data.template = 'member_notifications';
                         }
 
                         postdata = $.extend( {
@@ -430 +435 @@
                                                 extras       : extras
                                         };
 
-                                        if ( 'group_members' === object ) {
-                                                $.extend( queryData, { template: 'groups/single/members-loop' } );
-                                        } else if ( 'group_requests' === object ) {
-                                                $.extend( queryData, { template: 'groups/single/requests-loop' } );
-                                        } else if ( 'notifications' === object ) {
-                                                $.extend( queryData, { template: 'members/single/notifications/notifications-loop' } );
-                                        }
-
                                         // Populate the object list
                                         self.objectRequest( queryData );
                                 }
@@ -617 +614 @@
                                 search_terms = $( '#buddypress [data-bp-search="' + object + '"] input[type=search]' ).val();
                         }
 
-                        // On the Groups Members page, we specify a template
-                        if ( 'group_members' === object ) {
-                                template = 'groups/single/members-loop';
-                        }
-
-                        // On the Members notifications page, we specify a template
-                        if ( 'notifications' === object ) {
-                                template = 'members/single/notifications/notifications-loop';
-                        }
-
                         if ( 'friends' === object ) {
                                 object = 'members';
                         }
@@ -664 +651 @@
                                 scope = $( self.objectNavParent + ' [data-bp-object="' + object + '"].selected' ).data( 'bp-scope' );
                         }
 
-                        if ( 'group_members' === object ) {
-                                template = 'groups/single/members-loop';
-                        }
-
-                        if ( 'notifications' === object ) {
-                                template = 'members/single/notifications/notifications-loop';
-                        }
-
                         self.objectRequest( {
                                 object       : object,
                                 scope        : scope,
@@ -895 +874 @@
                                 page         : self.getLinkParams( navLink.prop( 'href' ), pagArg ) || 1
                         };
 
-                        if ( 'group_members' === object ) {
-                                $.extend( queryData, { template: 'groups/single/members-loop' } );
-                        } else if ( 'group_requests' === object ) {
-                                $.extend( queryData, { template: 'groups/single/requests-loop' } );
-                        } else if ( 'notifications' === object ) {
-                                $.extend( queryData, { template: 'members/single/notifications/notifications-loop' } );
-                        }
-
                         // Request the page
                         self.objectRequest( queryData );
                 }