From d47195a7878095336f9c9edc6f96244257f67eec Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Tue, 22 Apr 2025 13:30:11 +0200
Subject: [PATCH] Do not autoload sub-folders if autoload pages is disabled

---
 plugins/example.json   | 2 +-
 system/src/Plugins.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/example.json b/plugins/example.json
index 681136fb..395db41d 100644
--- a/plugins/example.json
+++ b/plugins/example.json
@@ -46,7 +46,7 @@
 	"settings": "plugins/your-plugin-folder/settings.php",
 	"autoload": {
 		"pages": true,
-		"pagesSubFolders": false,
+		"pages-sub-folders": false,
 		"commands": true,
 		"themes": true,
 		"admin-pages": true,
diff --git a/system/src/Plugins.php b/system/src/Plugins.php
index a0910b01..f9d4d5ce 100644
--- a/system/src/Plugins.php
+++ b/system/src/Plugins.php
@@ -151,7 +151,8 @@ class Plugins {
 				$pagesDefaultPriority = $plugin['pages-default-priority'];
 			}
 
-			if (self::getAutoLoadOption($plugin, 'pages', true)) {
+			$autoLoadPages = self::getAutoLoadOption($plugin, 'pages', true);
+			if ($autoLoadPages) {
 				//
 				// Get all plugins/*/pages/*.php pages
 				//
@@ -164,7 +165,8 @@ class Plugins {
 				}
 			}
 
-			if (self::getAutoLoadOption($plugin, 'pagesSubFolders', true)) {
+			if ($autoLoadPages && self::getAutoLoadOption($plugin, 'pagesSubFolders', true) &&
+				self::getAutoLoadOption($plugin, 'pages-sub-folders', true)) {
 				//
 				// Get all plugins/*/pages/subFolder/*.php pages
 				//