mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

Removed auto-inserting of {WMESSAGE} when theme.html is detected. Improved theme layout debug message.

Browse Source
This commit is contained in:
Cameron
2021-05-07 10:57:05 -07:00
parent 4c56593f81
commit da3c207fa3
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_core/templates/header_default.php
View File

@@ -658,7 +658,7 @@ echo "</head>\n";
} }
else // Debug info only. No need for LAN. else // Debug info only. No need for LAN.
{ {
echo e107::getMessage()->addError("There is no layout in theme.php with the key: <b>".$def."</b>")->render(); echo e107::getMessage()->addError("There is no layout in theme.php with the key: <b>".$def."</b> or your layout is missing {---}. ")->render();
} }
} }
@@ -805,7 +805,7 @@ e107::getDebug()->logTime('Render Layout');
// echo $HEADER; // echo $HEADER;
} }
unset($def, $noBody, $psc);
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@@ -838,7 +838,7 @@ e107::getDebug()->logTime('Render Other');
* fix - only when e_FRONTPAGE set to true * fix - only when e_FRONTPAGE set to true
* @see core_index_index_controller/actionIndex * @see core_index_index_controller/actionIndex
*/ */
if(deftrue('e_FRONTPAGE') && strpos($HEADER, "{WMESSAGE") === false && strpos($FOOTER, "{WMESSAGE") === false) // Auto-detection to override old pref. if(deftrue('e_FRONTPAGE') && ($noBody !== true) && strpos($HEADER, "{WMESSAGE") === false && strpos($FOOTER, "{WMESSAGE") === false) // Auto-detection to override old pref.
{ {
echo e107::getParser()->parseTemplate("{WMESSAGE}"); echo e107::getParser()->parseTemplate("{WMESSAGE}");
} }
@@ -862,5 +862,7 @@ e107::getDebug()->logTime('Render Other');
unset($text); unset($text);
} }
unset($def, $noBody, $psc);
$GLOBALS['FOOTER'] = $FOOTER; $GLOBALS['FOOTER'] = $FOOTER;
//Trim whitepsaces after end of the script //Trim whitepsaces after end of the script