From 8aff75a80550d1194d364a073818fb23ff11b362 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Tue, 7 Jul 2020 21:11:13 +0100
Subject: [PATCH] Bugfix: Don't redirect when navigating to a redirect page
 from a page list

---
 modules/page-list.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/page-list.php b/modules/page-list.php
index 31b7496..1833779 100644
--- a/modules/page-list.php
+++ b/modules/page-list.php
@@ -286,7 +286,11 @@ function generate_page_list($pagelist)
 			!empty($pageindex->$pagename->redirect))
 			$pageDisplayName = "<em>$pageDisplayName</em>";
 		
-		$result .= "<li><a href='index.php?page=" . rawurlencode($pagename) . "'>$pageDisplayName</a>
+		$url = "index.php?page=" . rawurlencode($pagename);
+		if(isset($pageindex->$pagename->redirect) && $pageindex->$pagename->redirect == true)
+			$url .= "&amp;redirect=no";
+		
+		$result .= "<li><a href='$url'>$pageDisplayName</a>
 		<em class='size'>(" . human_filesize($pageindex->$pagename->size) . ")</em>
 		<span class='editor'><span class='texticon cursor-query' title='Last editor'>&#9998;</span> " . $pageindex->$pagename->lasteditor . "</span>
 		<time class='cursor-query' title='" . date("l jS \of F Y \a\\t h:ia T", $pageindex->$pagename->lastmodified) . "'>" . human_time_since($pageindex->$pagename->lastmodified) . "</time>