fix(attachments): fix attachments formatting

hypeJunction · May 7, 2018 · 59a9a34 · 59a9a34
1 parent 4c64680
commit 59a9a34
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/classes/hypeJunction/Wall/Post.php b/classes/hypeJunction/Wall/Post.php
@@ -70,6 +70,8 @@ public function formatAttachments() {
 			'entity' => $this,
 		]);
 
+		$attachments = array_filter($attachments);
+
 		$output = (count($attachments)) ? implode('', $attachments) : false;
 		return elgg_trigger_plugin_hook('attachments:format', 'wall', ['entity' => $this], $output);
 	}

diff --git a/views/default/output/wall/attachments.php b/views/default/output/wall/attachments.php
@@ -30,7 +30,7 @@
 elgg_push_context('wall-attachments');
 
 if (empty($non_images)) {
-	echo elgg_view_entity_list($images, [
+	$output = elgg_view_entity_list($images, [
 		'full_view' => false,
 		'pagination' => false,
 		'list_type' => 'gallery',
@@ -39,14 +39,18 @@
 		'rel' => "wall-popup-{$entity->guid}",
 	]);
 } else {
-	echo elgg_view_entity_list(array_merge($images, $non_images), [
+	$output = elgg_view_entity_list(array_merge($images, $non_images), [
 		'full_view' => false,
 		'pagination' => false,
 		'list_class' => 'wall-attachments-list',
 	]);
 }
 
 elgg_pop_context();
+
+if (!$output) {
+    return;
+}
 ?>
 <script>
 	require(['output/wall/attachments'], function (lib) {