X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/b130f5a583949b90a36df32be8ce337959759578..218c239a4dc23c0dbe3878109c2f844d978ec626:/widget/issue/activity.php

diff --git a/widget/issue/activity.php b/widget/issue/activity.php
index a153f87..1d1a37a 100644
--- a/widget/issue/activity.php
+++ b/widget/issue/activity.php
@@ -6,13 +6,15 @@ $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 .= " AND m.announced";
 $sql .= " ORDER BY m.created DESC LIMIT $limit";
 $query = $Db->query($sql);
 $rows = $query->fetchall();
 
 $msgformat = [
-	"{(?=</p>\n).+}s" => ' <small class="footer">(Meer op de site)</small>',
-	'{(.*)(<p><img [^>]+></p>)\s*}s' => "$2\n$1",
+	'{(.*)(<p><img [^>]+></p>)\s*}s' => "$2$1",
+	"{(</p>\n).{20,}}s" => ' <small class="footer">(Meer op de site)</small>$1',
 	'{(?<=<img src=")(?:/thumb/[^/]+)?(?=/)}' => '/thumb/300x',
 ];