From 6d8f4718a1d349fba8f0ebc39cfd3a1a84d104b0 Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Sun, 6 Apr 2025 22:37:36 +0200
Subject: [PATCH] pages in theme folder have precedence over normal pages

---
 system/router.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/system/router.php b/system/router.php
index 5b103a90..ab9ea966 100644
--- a/system/router.php
+++ b/system/router.php
@@ -343,16 +343,16 @@ function getDatabasePages($withHidden = false): array
 
 function loadPageFromFileSystem($page, &$found): string
 {
-	$file = SYSTEM . 'pages/' . $page . '.php';
+	// feature: load pages from templates/ dir
+	global $template_path;
+	$file = $template_path . '/pages/' . $page . '.php';
 	if (!is_file($file)) {
-		// feature: convert camelCase to snake_case
-		// so instead of forum/move_thread
-		// we can write: forum/moveThread
-		$file = SYSTEM . 'pages/' . camelCaseToUnderscore($page) . '.php';
+		$file = SYSTEM . 'pages/' . $page . '.php';
 		if (!is_file($file)) {
-			// feature: load pages from templates/ dir
-			global $template_path;
-			$file = $template_path . '/pages/' . $page . '.php';
+			// feature: convert camelCase to snake_case
+			// so instead of forum/move_thread
+			// we can write: forum/moveThread
+			$file = SYSTEM . 'pages/' . camelCaseToUnderscore($page) . '.php';
 			if (!is_file($file)) {
 				$found = false;
 			}