1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-09 08:06:38 +02:00

Improved theme layout detection

This commit is contained in:
Cameron
2019-03-26 12:05:01 -07:00
parent 2013acded7
commit 87b053c095

View File

@@ -373,7 +373,20 @@ class e_theme
foreach($cusPageArray as $kpage) 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, '!'); $kpage = rtrim($kpage, '!');
@@ -395,10 +408,7 @@ class e_theme
{ {
$def = $lyout; $def = $lyout;
} }
elseif(!empty($request_script) && $kpage === $request_script) // exact script match
{
$def = $lyout;
}
} }
} }
} }