From 083250adc016f7ef6d1882d1128f816af84019ae Mon Sep 17 00:00:00 2001
From: Greg Sarjeant <1686767+gsarjeant@users.noreply.github.com>
Date: Sat, 14 Jun 2025 15:35:43 -0400
Subject: [PATCH] Restore atom feed to last working version. Escape late.

---
 src/Model/TickModel/TickModel.php |  2 +-
 templates/feed/atom.php           | 19 +++++++++----------
 templates/partials/tick.php       |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/Model/TickModel/TickModel.php b/src/Model/TickModel/TickModel.php
index 569611c..bcfe9cc 100644
--- a/src/Model/TickModel/TickModel.php
+++ b/src/Model/TickModel/TickModel.php
@@ -90,7 +90,7 @@ class TickModel {
         $lines = file($file, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
         foreach ($lines as $line) {
             if (str_starts_with($line, $timestamp)) {
-                $tick = Util::escape_and_linkify(explode('|', $line)[1]);
+                $tick = explode('|', $line)[1];
 
                 return [
                     'tickTime' => $tickTime,
diff --git a/templates/feed/atom.php b/templates/feed/atom.php
index 0a21399..3c92864 100644
--- a/templates/feed/atom.php
+++ b/templates/feed/atom.php
@@ -13,11 +13,11 @@ echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
   <title><?= "$siteTitle Atom Feed" ?></title>
   <link rel="self"
         type="application/atom+xml"
-        title="<?php echo htmlspecialchars($config->siteTitle, ENT_XML1, 'UTF-8') ?> Atom Feed"
-        href="<?php echo htmlspecialchars($siteUrl . $basePath, ENT_XML1, 'UTF-8') ?>feed/atom">
-  <link rel="alternate" href="<?= $siteUrl . $basePath ?>">
+        title="<?php echo htmlspecialchars($config->siteTitle) ?> Atom Feed"
+        href="<?php echo htmlspecialchars($siteUrl . $basePath) ?>feed/atom" />
+  <link rel="alternate" href="<?= $siteUrl ?>"/>
   <updated><?= $updated ?></updated>
-  <id><?= $siteUrl . $basePath . 'feed/atom'?></id>
+  <id><?= $siteUrl ?></id>
   <author>
         <name><?= $siteTitle ?></name>
   </author>
@@ -30,17 +30,16 @@ echo '<?xml version="1.0" encoding="utf-8"?>' . "\n";
     [$hour, $minute, $second] = $timeParts;
 
     $tickPath = "$year/$month/$day/$hour/$minute/$second";
-    $tickUrl = htmlspecialchars($siteUrl . $basePath . "tick/$tickPath", ENT_XML1, 'UTF-8');
+    $tickUrl = htmlspecialchars($siteUrl . $basePath . "tick/$tickPath");
     $tickTime = date(DATE_ATOM, strtotime($tick['timestamp']));
-    $tickTitle = htmlspecialchars($tick['tick'], ENT_XML1, 'UTF-8');
-    $tickContent = Util::escape_and_linkify($tick['tick'], ENT_XML1, false);
+    $tickText = htmlspecialchars($tick['tick']);
 ?>
   <entry>
-    <title><?= $tickTitle ?></title>
-    <link rel="alternate" type="text/html" href="<?= $tickUrl ?>"/>
+    <title><?= $tickText ?></title>
+    <link href="<?= $tickUrl ?>"/>
     <id><?= $tickUrl ?></id>
     <updated><?= $tickTime ?></updated>
-    <content type="html"><?= $tickContent ?></content>
+    <content type="html"><?= $tickText ?></content>
   </entry>
 <?php endforeach; ?>
 </feed>
diff --git a/templates/partials/tick.php b/templates/partials/tick.php
index e85ecc3..8ec7d21 100644
--- a/templates/partials/tick.php
+++ b/templates/partials/tick.php
@@ -2,4 +2,4 @@
 <?php /** @var Date $tickTime */ ?>
 <?php /** @var string $tick */ ?>
         <h1>Tick from <?= $tickTime->format('Y-m-d H:i:s'); ?></h1>
-        <p><?= $tick ?></p>
\ No newline at end of file
+        <p><?= Util::escape_and_linkify($tick) ?></p>