Merge pull request #4410 from buddyboss/PROD-7043

[PROD-7043] Move media template parts inclusion into messages template
buddyboss · Jun 12, 2024 · 8f71d51 · 8f71d51
2 parents 219bc90 + 52c0e67
commit 8f71d51
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php b/src/bp-templates/bp-nouveau/buddypress/common/js-templates/messages/index.php
@@ -28,3 +28,15 @@
 	<div class="bp-messages-content"></div>
 
 </div>
+
+<?php
+
+if ( bp_is_active( 'media' ) && bp_is_messages_media_support_enabled() ) {
+	bp_get_template_part( 'media/theatre' );
+}
+if ( bp_is_active( 'video' ) && bp_is_messages_video_support_enabled() ) {
+	bp_get_template_part( 'video/theatre' );
+}
+if ( bp_is_active( 'media' ) && bp_is_messages_document_support_enabled() ) {
+	bp_get_template_part( 'document/theatre' );
+}
diff --git a/src/bp-templates/bp-nouveau/includes/messages/functions.php b/src/bp-templates/bp-nouveau/includes/messages/functions.php
@@ -83,16 +83,6 @@ function bp_nouveau_messages_enqueue_scripts() {
 	wp_enqueue_style( 'bp-medium-editor' );
 	wp_enqueue_style( 'bp-medium-editor-beagle' );
 
-	if ( bp_is_active( 'media' ) && bp_is_messages_media_support_enabled() ) {
-		bp_get_template_part( 'media/theatre' );
-	}
-	if ( bp_is_active( 'video' ) && bp_is_messages_video_support_enabled() ) {
-		bp_get_template_part( 'video/theatre' );
-	}
-	if ( bp_is_active( 'media' ) && bp_is_messages_document_support_enabled() ) {
-		bp_get_template_part( 'document/theatre' );
-	}
-
 	/**
 	 * Split each js template to its own file. Easier for child theme to
 	 * overwrite individual parts.