From b3561aa61e022b65d5c0601edaf27059ff7f2da4 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Tue, 27 Apr 2021 21:51:34 +0200
Subject: [PATCH] issue/activity: only concatenate messages after images

Fix cascading floats in mixed threads.
---
 widget/issue/activity.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/widget/issue/activity.php b/widget/issue/activity.php
index 23b95c6..371f11a 100644
--- a/widget/issue/activity.php
+++ b/widget/issue/activity.php
@@ -11,7 +11,7 @@ $query = $Db->query($sql);
 
 $msgformat = [
 	"{(?=</p>\n).+}s" => ' <small class="footer">(Meer op de site)</small>',
-	'{(.*)(<p><img [^>]+></p>)\s*}' => "$2\n$1",
+	'{(.*)(<p><img [^>]+></p>)\s*}s' => "$2\n$1",
 	'{(?<=<img src=")(?=/)}' => '/thumb/300x',
 ];
 
@@ -19,7 +19,8 @@ print '<dl class="replies">';
 
 $prev = NULL;
 while ($row = $query->fetch()) {
-	if (!$prev or $prev->issue !== $row->issue or $prev->author !== $row->author) {
+	if (!$prev or $prev->issue !== $row->issue or $prev->author !== $row->author
+	or !preg_match('/\A<p><img/', $prev->message)) {
 		print '<dt>';
 		if (!$prev or $prev->issue !== $row->issue) {
 			printf('<a href="/%s">%s</a>', $row->page, $row->subject);
-- 
2.30.0