From 8cadcd1584f672fe4491a5e6a737c4d8ce58bd14 Mon Sep 17 00:00:00 2001
From: Zsolt <zsolt.nagy@gizra.com>
Date: Mon, 11 Mar 2024 19:25:39 +0100
Subject: [PATCH 1/2] Fixed main settings check.

---
 web/modules/custom/server_general/server_general.module | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/web/modules/custom/server_general/server_general.module b/web/modules/custom/server_general/server_general.module
index d935ff68c..a2cff8f35 100644
--- a/web/modules/custom/server_general/server_general.module
+++ b/web/modules/custom/server_general/server_general.module
@@ -111,13 +111,10 @@ function server_general_node_access(NodeInterface $entity, string $op, AccountIn
   }
 
   $main_settings = server_general_get_main_settings();
-  if (!$main_settings instanceof ConfigPages) {
-    AccessResult::neutral();
-  }
-  // Add cache tags to the cache metadata.
-  $cache_tags = $main_settings->getCacheTags();
 
-  if ($op === 'delete' && server_general_is_node_locked($entity)) {
+  if ($main_settings instanceof ConfigPages && $op === 'delete' && server_general_is_node_locked($entity)) {
+    // Add cache tags to the cache metadata.
+    $cache_tags = $main_settings->getCacheTags();
     return AccessResult::forbidden()->addCacheableDependency($entity)->addCacheTags($cache_tags);
   }
 

From c74a9fd4ae84917d110cb11436d5cd3994b3704a Mon Sep 17 00:00:00 2001
From: Zsolt Nagy <balagan73@gmail.com>
Date: Mon, 11 Mar 2024 19:48:48 +0100
Subject: [PATCH 2/2] Update
 web/modules/custom/server_general/server_general.module

Co-authored-by: Mariano D'Agostino <mariano-dagostino@users.noreply.github.com>
---
 web/modules/custom/server_general/server_general.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/modules/custom/server_general/server_general.module b/web/modules/custom/server_general/server_general.module
index a2cff8f35..539e3461b 100644
--- a/web/modules/custom/server_general/server_general.module
+++ b/web/modules/custom/server_general/server_general.module
@@ -112,7 +112,7 @@ function server_general_node_access(NodeInterface $entity, string $op, AccountIn
 
   $main_settings = server_general_get_main_settings();
 
-  if ($main_settings instanceof ConfigPages && $op === 'delete' && server_general_is_node_locked($entity)) {
+  if ($op === 'delete' && $main_settings instanceof ConfigPages && server_general_is_node_locked($entity)) {
     // Add cache tags to the cache metadata.
     $cache_tags = $main_settings->getCacheTags();
     return AccessResult::forbidden()->addCacheableDependency($entity)->addCacheTags($cache_tags);