Ticket #8046: 8046.1.diff

src/bp-core/bp-core-template-loader.php

@@ -19 +19 @@
  *
  * @since 1.7.0
  *
- * @param string      $slug Template part slug. Used to generate filenames,
- *                          eg 'friends' for 'friends.php'.
- * @param string|null $name Optional. Template part name. Used to generate
- *                          secondary filenames, eg 'personal' for 'activity-personal.php'.
+ * @param string      $slug         Template part slug. Used to generate filenames,
+ *                                  eg 'friends' for 'friends.php'.
+ * @param string|null $name         Optional. Template part name. Used to generate
+ *                                  secondary filenames, eg 'personal' for 'activity-personal.php'.
+ * @param bool|null   $load         Optional. If true, the template file will be loaded when
+ *                                  found. If false, the path will be returned. Default: true.
+ * @param bool|null   $require_once Optional. Whether to require_once or require. Has
+ *                                  no effect if $load is false. Default: false.
  * @return false|string Path to located template. See {@link bp_locate_template()}.
  */
-function bp_get_template_part( $slug, $name = null ) {
+function bp_get_template_part( $slug, $name = null, $load = true, $require_once = false ) {
 
         /**
          * Fires at the start of bp_get_template_part().
@@ -58 +62 @@
         $templates = apply_filters( 'bp_get_template_part', $templates, $slug, $name );
 
         // Return the part that is found.
-        return bp_locate_template( $templates, true, false );
+        return bp_locate_template( $templates, $load, $require_once );
 }
 
 /**
@@ -105 +109 @@
         // No file found yet.
         $located            = false;
         $template_locations = bp_get_template_stack();
-
         // Try to find a template file.
         foreach ( (array) $template_names as $template_name ) {
 

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

@@ -103 +103 @@
         switch ( $template ) {
                 case 'group_members' :
                 case 'groups/single/members' :
-                        $template_part = 'groups/single/members-loop.php';
+                        $template_part = 'groups/single/members-loop';
                 break;
 
                 case 'group_requests' :
-                        $template_part = 'groups/single/requests-loop.php';
+                        $template_part = 'groups/single/requests-loop';
                 break;
 
                 case 'friend_requests' :
-                        $template_part = 'members/single/friends/requests-loop.php';
+                        $template_part = 'members/single/friends/requests-loop';
                 break;
 
                 case 'member_notifications' :
-                        $template_part = 'members/single/notifications/notifications-loop.php';
+                        $template_part = 'members/single/notifications/notifications-loop';
                 break;
 
                 default :
-                        $template_part = $object . '/' . $object . '-loop.php';
+                        $template_part = $object . '/' . $object . '-loop';
                 break;
         }
 
         ob_start();
 
-        $template_path = bp_locate_template( array( $template_part ), false );
+        $template_path = bp_get_template_part( $template_part, null, false );
 
         /**
          * Filters the server path for the template loader.