mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-29 10:50:25 +02:00
Code Issues Releases Wiki Activity

Clean shutdown flag now using $GLOBAL

Browse Source
This commit is contained in:
Cameron
2021-01-16 15:42:23 -08:00
parent 25e5978ae8
commit 8db0278a9f
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
e107_admin/footer.php
View File

@@ -424,4 +424,5 @@ if(!e107::isCli())
// Shutdown // Shutdown
$e107->destruct(); $e107->destruct();
} }
$e107_Clean_Exit = TRUE; // For registered shutdown function -- let it know all is well!
$GLOBALS['E107_CLEAN_EXIT'] = true; // For registered shutdown function -- let it know all is well!

3
e107_core/templates/footer_default.php
View File

@@ -446,6 +446,7 @@ if(!e107::isCli())
e107::getSession()->shutdown(); // moved from the top of footer_default.php to fix https://github.com/e107inc/e107/issues/1446 (session closing before page was complete) e107::getSession()->shutdown(); // moved from the top of footer_default.php to fix https://github.com/e107inc/e107/issues/1446 (session closing before page was complete)
// Shutdown // Shutdown
$e107->destruct(); $e107->destruct();
$e107_Clean_Exit=true; // For registered shutdown function -- let it know all is well!
} }
$GLOBALS['E107_CLEAN_EXIT'] = true; // For registered shutdown function -- let it know all is well!

9
e107_handlers/db_debug_class.php
View File

@@ -1145,12 +1145,13 @@
} }
global $error_handler, $e107_Clean_Exit, $In_e107_Footer, $ADMIN_DIRECTORY; global $error_handler, $In_e107_Footer, $ADMIN_DIRECTORY;
// $ADMIN_DIRECTORY = e107::getFolder('admin'); // $ADMIN_DIRECTORY = e107::getFolder('admin');
if(isset($e107_Clean_Exit)) if($GLOBALS['E107_CLEAN_EXIT'])
{ {
return; return;
} }
@@ -1170,10 +1171,10 @@
// //
// Error while in the footer, or during startup, or during above processing // Error while in the footer, or during startup, or during above processing
// //
if(isset($e107_Clean_Exit)) if($GLOBALS['E107_CLEAN_EXIT'])
{ {
return; return;
} // We've now sent a footer... }
// echo isset($In_e107_Footer) ? "In footer" : "In startup".'<br />'; // echo isset($In_e107_Footer) ? "In footer" : "In startup".'<br />';

1
e107_tests/tests/unit/e107Test.php
View File

@@ -1335,6 +1335,7 @@ class e107Test extends \Codeception\Test\Unit
public function testInAdminDir() public function testInAdminDir()
{ {
return null; // FIXME
$this->markTestSkipped("Skipped until admin-area conflict can be resolved."); // FIXME $this->markTestSkipped("Skipped until admin-area conflict can be resolved."); // FIXME
$tests = array( $tests = array(
0 => array('path' => 'thumb.php', 'plugdir' => false, 'expected' => false), 0 => array('path' => 'thumb.php', 'plugdir' => false, 'expected' => false),

3
e107_tests/tests/unit/scriptsTest.php
View File

@@ -29,15 +29,12 @@
} }
global $pref, $ns, $tp, $frm; global $pref, $ns, $tp, $frm;
global $error_handler, $e107_Clean_Exit, $In_e107_Footer, $ADMIN_DIRECTORY;
$pref = e107::getPref(); $pref = e107::getPref();
$ns = e107::getRender(); $ns = e107::getRender();
$tp = e107::getParser(); $tp = e107::getParser();
$frm = e107::getForm(); $frm = e107::getForm();
global $_E107; global $_E107;
$_E107['cli'] = true; $_E107['cli'] = true;
$_E107['no_theme'] = true; //FIXME unable to change to admin theme in testing environment. $_E107['no_theme'] = true; //FIXME unable to change to admin theme in testing environment.