Changeset 11821

Timestamp:

01/25/2018 08:23:37 PM (7 years ago)

Author:

djpaul

Message:

Templates: improvements to template loading methods.

Location:

trunk/src/bp-templates

Files:

• bp-legacy/buddypress-functions.php (modified) (1 diff)
• bp-nouveau/includes/ajax.php (modified) (1 diff)

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

@@ -804 +804 @@
         bp_update_is_directory( true, bp_current_component() );
 
-    $template_part = $object . '/' . $object . '-loop';
-
     // The template part can be overridden by the calling JS function.
-    if ( ! empty( $_POST['template'] ) ) {
-        $template_part = sanitize_option( 'upload_path', $_POST['template'] );
-    }
-
-    // Locate the object template.
-    bp_get_template_part( $template_part );
+    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';
+    }
+
+    $template_path = bp_locate_template( array( $template_part ), false );
+
+    $template_path = apply_filters( 'bp_legacy_object_template_path', $template_path );
+
+    load_template( $template_path );
     exit();
 }

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

@@ -88 +88 @@
     }
 
-    $template_part = $object . '/' . $object . '-loop';
-
     // The template part can be overridden by the calling JS function.
-    if ( ! empty( $_POST['template'] ) ) {
-        $template_part = sanitize_option( 'upload_path', $_POST['template'] );
+    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';
     }
 
     ob_start();
-    bp_get_template_part( $template_part );
+
+    $template_path = bp_locate_template( array( $template_part ), false );
+    $template_path = apply_filters( 'bp_legacy_object_template_path', $template_path );
+
+    load_template( $template_path );
     $result['contents'] = ob_get_contents();
     ob_end_clean();