From 3a4f1ae1a32baa3658d54c3dadf268bab01308a2 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Wed, 1 Jan 2020 12:06:15 +0100
Subject: [PATCH] issue: derive page metadata from row data

---
 issue/index.php  | 5 ++++-
 widget/reply.php | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/issue/index.php b/issue/index.php
index 332179e..3f665db 100644
--- a/issue/index.php
+++ b/issue/index.php
@@ -14,6 +14,9 @@ if ($id and ctype_digit($id)) {
 	$replies = placeholder_include('reply');  # handle updates
 
 	$Article->title .= ': '.htmlspecialchars($Issue->subject);
+	$Article->teaser = $Issue->body;
+	$Article->body = $replies;  # find image
+
 	print "<h2>{$Article->title}</h2>\n";
 	print "<dl class=\"aside right sidebar\">\n";
 	print '<dt>Geplaatst</dt>';
@@ -54,7 +57,7 @@ if ($_POST) {
 
 $subsql = "SELECT count(*) FROM comments WHERE page=i.page||'/'||i.id";
 $cols = "*, ($subsql AND message IS NOT NULL) AS replycount";
-$cols .= ", ($subsql AND message ~ 'img') AS imagecount";
+$cols .= ", ($subsql AND message ~ '<img') AS imagecount";
 $sql = "SELECT $cols FROM issues i WHERE page = ?";
 if (isset($_GET['open'])) {
 	$sql .= ' AND closed IS NULL';
diff --git a/widget/reply.php b/widget/reply.php
index fd01a94..9e1c7e3 100644
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -67,7 +67,7 @@ while ($row = $query->fetch()) {
 	printf('<strong>%s</strong> <small class=date>%s</small>',
 		$rowuser->html, showdate(preg_split('/\D/', $row->created))
 	);
-	printf("<blockquote>%s</blockquote>\n", $row->message);
+	printf("<blockquote>\n%s</blockquote>\n", $row->message);
 	if ($changes = json_decode($row->journal)) {
 		print '<ul>';
 		foreach ($changes as $change) {
-- 
2.30.0