From c901832c6e8dfc7cf5699b089a2db7506f31abf8 Mon Sep 17 00:00:00 2001 From: Nick Liu Date: Tue, 26 May 2020 02:42:45 -0500 Subject: [PATCH] Fixes #1836 - Apply fix for #1446 to admin area This is the same bugfix as the one for #1446. It needs to be duplicated for the admin area. See stack trace analysis of the bug here: https://github.com/e107inc/e107/issues/1836#issuecomment-633858469 --- e107_admin/footer.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/e107_admin/footer.php b/e107_admin/footer.php index 078e39f63..11e64d38c 100644 --- a/e107_admin/footer.php +++ b/e107_admin/footer.php @@ -33,9 +33,6 @@ if(!deftrue('e_ADMIN_UI') && !deftrue('ADMIN_AREA')) echo $content; } -// Clean session shutdown -e107::getSession()->shutdown(); - // // SHUTDOWN SEQUENCE // @@ -395,10 +392,6 @@ if($tmp1) $tmp['replace'][] = $tmp1; } - -// Shutdown -$e107->destruct(); - // New - see class2.php $ehd = new e_http_header; if($tmp) @@ -417,8 +410,11 @@ $page = $ehd->getOutput(); // real output echo $page; - unset($In_e107_Footer); -$e107_Clean_Exit = TRUE; // For registered shutdown function -- let it know all is well! +// Clean session shutdown +e107::getSession()->shutdown(); +// Shutdown +$e107->destruct(); +$e107_Clean_Exit = TRUE; // For registered shutdown function -- let it know all is well! \ No newline at end of file