From: Mischa POSLAWSKY
Date: Tue, 27 Apr 2021 19:51:34 +0000 (+0200)
Subject: issue/activity: only concatenate messages after images
X-Git-Tag: v5.3~16
X-Git-Url: http://git.shiar.nl/minimedit.git/commitdiff_plain/b3561aa61e022b65d5c0601edaf27059ff7f2da4
issue/activity: only concatenate messages after images
Fix cascading floats in mixed threads.
---
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 = [
"{(?=
\n).+}s" => ' ',
- '{(.*)(]+>
)\s*}' => "$2\n$1",
+ '{(.*)(]+>
)\s*}s' => "$2\n$1",
'{(?<=';
$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('/\Amessage)) {
print '
';
if (!$prev or $prev->issue !== $row->issue) {
printf('%s', $row->page, $row->subject);