X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/1e6e0732eb889ea7f8ca17ba467bf2a9a2ff5cbd..f8527c143033f51fecd929789ef7ad6589c8c2b4:/widget/issue/activity.php?ds=sidebyside diff --git a/widget/issue/activity.php b/widget/issue/activity.php index cd99e48..df872ae 100644 --- a/widget/issue/activity.php +++ b/widget/issue/activity.php @@ -7,29 +7,51 @@ $cols = 'm.*, i.subject, i.updated, i.closed'; $sql = "SELECT $cols FROM messages m JOIN issues i ON i.id = issue"; $sql .= " WHERE message IS NOT NULL"; $sql .= " ORDER BY m.created DESC LIMIT $limit"; -$sql = "SELECT * FROM ($sql) x ORDER BY updated DESC, created, id"; # grouped issues $query = $Db->query($sql); +$rows = $query->fetchall(); + +$msgformat = [ + '{(.*)(
]+>
]*><\/p>)+\z/', $row->message)) {
+ # postpone related image to the following message
+ $next->message = $row->message . $next->message;
+ continue;
+ }
+
+ if (!$prev or $prev->issue !== $row->issue or $prev->author !== $row->author
+ or !preg_match('/\A
message)) {
print '
%s", $row->message); - print "