X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/e02706eef130529aac80bb58cf9755c850e316a7..b3561aa61e022b65d5c0601edaf27059ff7f2da4:/widget/issue/activity.php?ds=sidebyside

diff --git a/widget/issue/activity.php b/widget/issue/activity.php
index 153034e..371f11a 100644
--- a/widget/issue/activity.php
+++ b/widget/issue/activity.php
@@ -11,34 +11,36 @@ $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',
 ];
 
 print '<dl class="replies">';
 
-$group = NULL;
+$prev = NULL;
 while ($row = $query->fetch()) {
-	print '<dt>';
-	if ($group !== $row->issue) {
-		$group = $row->issue;
-		printf('<a href="/%s">%s</a>', $row->page, $row->subject);
-		if ($row->closed) {
-			print ' <em>(opgelost)</em>';
+	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);
+			if ($row->closed) {
+				print ' <em>(opgelost)</em>';
+			}
 		}
+		print '<span class="right">';
+		if ($row->author and $rowuser = new User("profile/{$row->author}")) {
+			printf('<strong>%s</strong> ', $rowuser->html);
+		}
+		printf('<small class="date">%s</small>',
+			showdate(preg_split('/\D/', $row->created))
+		);
+		print "</span>";
+		print '</dt>';
+		print '<dd>';
 	}
-	print '<span class="right">';
-	if ($row->author and $rowuser = new User("profile/{$row->author}")) {
-		printf('<strong>%s</strong> ', $rowuser->html);
-	}
-	printf('<small class="date">%s</small>',
-		showdate(preg_split('/\D/', $row->created))
-	);
-	print "</span>";
-	print '</dt>';
-	print '<dd>';
 	print preg_replace(array_keys($msgformat), array_values($msgformat), $row->message);
-	print "</dd>\n";
+	$prev = $row;
 }
 
 print "</dl>\n";