correct escaping of ampersand in prev/next subpage link

fabianswebworld · Jul 17, 2023 · 39d6ad5 · 39d6ad5
1 parent b3ef3b6
commit 39d6ad5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/includes/ttxweb_decoder.php b/includes/ttxweb_decoder.php
@@ -1,7 +1,7 @@
 <?php
 
 // ttxweb.php EP1 teletext document renderer
-// version: 1.2.0.604 (2023-07-17)
+// version: 1.2.0.606 (2023-07-17)
 // (c) 2023 Fabian Schneider - @fabianswebworld
 
 function renderEp1File($ep1Filename)
@@ -332,7 +332,7 @@ function renderEp1File($ep1Filename)
 
         // create prev/next subpage links
         if ($subpageNum < $numSubpages)  {
-            $htmlBuffer = preg_replace('/(-&gt;|&gt;&gt;)/', '<a href="?page=' . $pageNum . '&sub=' . $nextSubpageNum . $queryString . '">${1}</a>', $htmlBuffer);
+            $htmlBuffer = preg_replace('/(-&gt;|&gt;&gt;)/', '<a href="?page=' . $pageNum . '&amp;sub=' . $nextSubpageNum . $queryString . '">${1}</a>', $htmlBuffer);
         }
         else {
             $htmlBuffer = preg_replace('/(-&gt;|&gt;&gt;)/', '<a href="?page=' . $nextPageNum . $queryString . '">${1}</a>', $htmlBuffer);

diff --git a/includes/ttxweb_main.php b/includes/ttxweb_main.php
@@ -1,12 +1,12 @@
 <?php
 
 // ttxweb.php EP1 teletext document renderer
-// version: 1.2.0.604 (2023-07-17)
+// version: 1.2.0.606 (2023-07-17)
 // (c) 2023 Fabian Schneider - @fabianswebworld
 
 // global constants
 
-const TTXWEB_VERSION     = '1.2.0.604 (2023-07-17)';          // version string
+const TTXWEB_VERSION     = '1.2.0.606 (2023-07-17)';          // version string
 
 // for user and template configuration see ttxweb_config.php