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

Use e107::getFolder() for $ADMIN_DIRECTORY.

Browse Source
This commit is contained in:
Cameron 2021-01-16 16:13:48 -08:00
parent b927997759
commit 4c32e60bad
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/footer.php
View File

@ -17,7 +17,9 @@ if (!defined('e107_INIT'))
{
exit;
}
$In_e107_Footer = TRUE; // For registered shutdown function
$GLOBALS['E107_IN_FOOTER'] = true; // For registered shutdown function
global $error_handler,$db_time,$ADMIN_FOOTER;
@ -414,7 +416,7 @@ $page = $ehd->getOutput();
// real output
echo $page;
unset($In_e107_Footer);
$GLOBALS['E107_IN_FOOTER'] = false;
// Clean session shutdown

4
e107_core/templates/footer_default.php
View File

@ -16,7 +16,7 @@ if (!defined('e107_INIT'))
{
exit;
}
$In_e107_Footer = TRUE; // For registered shutdown function
$GLOBALS['E107_IN_FOOTER'] = true; // For registered shutdown function
$magicSC = e107::getRender()->getMagicShortcodes(); // support for {---TITLE---} etc.
@ -437,7 +437,7 @@ echo $page;
unset($In_e107_Footer);
$GLOBALS['E107_IN_FOOTER'] = false;
// Clean session shutdown

13
e107_handlers/db_debug_class.php
View File

@ -1145,19 +1145,18 @@
}
global $error_handler, $In_e107_Footer, $ADMIN_DIRECTORY;
// $ADMIN_DIRECTORY = e107::getFolder('admin');
global $error_handler;
if(!empty($GLOBALS['E107_CLEAN_EXIT']))
{
return;
}
if(!isset($In_e107_Footer))
if(empty($GLOBALS['E107_IN_FOOTER']))
{
$ADMIN_DIRECTORY = e107::getFolder('admin');
if(deftrue('ADMIN_AREA'))
{
$filewanted = realpath(__DIR__) . '/../' . $ADMIN_DIRECTORY . 'footer.php';
@ -1177,8 +1176,6 @@
return;
}
// echo isset($In_e107_Footer) ? "In footer" : "In startup".'<br />';
while(ob_get_level() > 0)
{
ob_end_flush();