X-Git-Url: http://git.shiar.nl/minimedit.git/blobdiff_plain/e02706eef130529aac80bb58cf9755c850e316a7..58c5ec6b45dcc52107f5e7c8bbca2933c7f2e98d:/widget/issue/activity.php?ds=sidebyside diff --git a/widget/issue/activity.php b/widget/issue/activity.php index 153034e..919ce77 100644 --- a/widget/issue/activity.php +++ b/widget/issue/activity.php @@ -6,39 +6,53 @@ $limit = $Page->place['n'] ?? 50; $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 .= " AND i.page <> 'spam'"; $sql .= " ORDER BY m.created DESC LIMIT $limit"; $query = $Db->query($sql); +$rows = $query->fetchall(); $msgformat = [ - "{(?=
\n).+}s" => ' (Meer op de site)', - '{(.*)(]+>
)\s*}' => "$2\n$1", - '{(?<=\n).{20,}}s" => ' (Meer op de site)$1', + '{(?<='; -$group = NULL; -while ($row = $query->fetch()) { - print ']*><\/p>)+\z/', $row->message)) {
+ # postpone related image to the following message
+ $next->message = $row->message . $next->message;
+ continue;
}
- print '';
- if ($row->author and $rowuser = new User("profile/{$row->author}")) {
- printf('%s ', $rowuser->html);
+
+ if (!$prev or $prev->issue !== $row->issue or $prev->author !== $row->author
+ or !preg_match('/\A message)) {
+ print '