X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/1e6e0732eb889ea7f8ca17ba467bf2a9a2ff5cbd..b3561aa61e022b65d5c0601edaf27059ff7f2da4:/widget/issue/activity.php?ds=sidebyside diff --git a/widget/issue/activity.php b/widget/issue/activity.php index cd99e48..371f11a 100644 --- a/widget/issue/activity.php +++ b/widget/issue/activity.php @@ -7,29 +7,40 @@ $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); +$msgformat = [ + "{(?=
\n).+}s" => ' (Meer op de site)', + '{(.*)(]+>
)\s*}s' => "$2\n$1", + '{(?<='; -$group = NULL; +$prev = NULL; while ($row = $query->fetch()) { - $rowuser = new User("profile/{$row->author}"); - if ($group !== $row->issue) { - $group = $row->issue; + if (!$prev or $prev->issue !== $row->issue or $prev->author !== $row->author + or !preg_match('/\Amessage)) { print '
%s", $row->message); - print "