From 91dba21b9d641e9b0a55c4d022d97a4a2d31a327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Guerreiro?= <joao.guerreiro@pixl8.co.uk>
Date: Thu, 20 Aug 2026 15:02:04 +0100
Subject: [PATCH 1/2] [twgit] Init feature
 'feature-ADMINTHEME-124_fix-postlayoutrender-abort'.


From 39cd4ea3e1f5ea2aa229ac8a9bc03f7e2970d5d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Guerreiro?= <joao.guerreiro@pixl8.co.uk>
Date: Thu, 20 Aug 2026 15:03:07 +0100
Subject: [PATCH 2/2] ADMINTHEME-124 Select the v2 admin layout without
 aborting the request so postLayoutRender fires

---
 layouts/admin.cfm      | 13 ++++++++-----
 layouts/adminLogin.cfm | 13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/layouts/admin.cfm b/layouts/admin.cfm
index 301431f..ab2d2de 100644
--- a/layouts/admin.cfm
+++ b/layouts/admin.cfm
@@ -1,8 +1,10 @@
 <cfscript>
-	if ( getSetting( name="adminTheme.layout", defaultValue="v1" ) == "v2" ) {
-		include template="adminV2.cfm";
-		abort;
-	}
+	useV2Layout = getSetting( name="adminTheme.layout", defaultValue="v1" ) == "v2";
+</cfscript>
+<cfif useV2Layout>
+	<cfinclude template="adminV2.cfm">
+<cfelse>
+<cfscript>
 
 	body             = renderView();
 	navbar           = renderView( "admin/util/topNav" );
@@ -130,4 +132,5 @@
 		#bottomJs#
 
 	</body>
-</html></cfoutput>
\ No newline at end of file
+</html></cfoutput>
+</cfif>
diff --git a/layouts/adminLogin.cfm b/layouts/adminLogin.cfm
index 78f1564..1dc998e 100644
--- a/layouts/adminLogin.cfm
+++ b/layouts/adminLogin.cfm
@@ -1,8 +1,10 @@
 <cfscript>
-	if ( getSetting( name="adminTheme.layout", defaultValue="v1" ) == "v2" ) {
-		include template="adminLoginV2.cfm";
-		abort;
-	}
+	useV2Layout = getSetting( name="adminTheme.layout", defaultValue="v1" ) == "v2";
+</cfscript>
+<cfif useV2Layout>
+	<cfinclude template="adminLoginV2.cfm">
+<cfelse>
+<cfscript>
 
 	body          = renderView();
 	notifications = renderView( 'admin/general/notifications' );
@@ -62,4 +64,5 @@
 
 		#bottomJs#
 	</body>
-</html></cfoutput>
\ No newline at end of file
+</html></cfoutput>
+</cfif>