From 87b053c095676a4758068a2f66440b235a052823 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 26 Mar 2019 12:05:01 -0700
Subject: [PATCH] Improved theme layout detection

---
 e107_handlers/theme_handler.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index 9b31ab239..786a1a5cf 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -373,7 +373,20 @@ class e_theme
 
 	            foreach($cusPageArray as $kpage)
 				{
-					if(substr($kpage, -1) === '!' )
+					$lastChar = substr($kpage, -1);
+
+					if($lastChar === '$') // script name match.
+					{
+						$kpage = rtrim($kpage, '$');
+						if(!empty($request_script) && $kpage === $request_script)
+						{
+							return $lyout;
+						}
+					}
+
+
+
+					if($lastChar === '!')
 					{
 
 						$kpage = rtrim($kpage, '!');
@@ -395,10 +408,7 @@ class e_theme
 					{
 						$def = $lyout;
 					}
-					elseif(!empty($request_script) && $kpage === $request_script) // exact script match
-					{
-						$def = $lyout;
-					}
+
 				}
 			}
 		}