Merge pull request #2739 from annando/1608-session-close

Only close the session if it had been opened.
This commit is contained in:
Tobias Diekershoff 2016-08-17 07:37:33 +02:00 committed by GitHub
commit 1519ac3bf4
3 changed files with 7 additions and 4 deletions

View file

@ -1698,7 +1698,9 @@ function login($register = false, $hiddens=false) {
* @brief Used to end the current process, after saving session state. * @brief Used to end the current process, after saving session state.
*/ */
function killme() { function killme() {
session_write_close(); if (!get_app()->is_backend())
session_write_close();
exit; exit;
} }

View file

@ -489,7 +489,8 @@ if (isset($_GET["mode"]) AND ($_GET["mode"] == "raw")) {
echo substr($target->saveHTML(), 6, -8); echo substr($target->saveHTML(), 6, -8);
session_write_close(); if (!$a->is_backend())
session_write_close();
exit; exit;
} }
@ -514,5 +515,6 @@ if(!$template) {
require_once($template); require_once($template);
session_write_close(); if (!$a->is_backend())
session_write_close();
exit; exit;

View file

@ -25,7 +25,6 @@ function hostxrd_init(&$a) {
'$zot_post' => z_root() . '/post', '$zot_post' => z_root() . '/post',
'$bigkey' => salmon_key(get_config('system','site_pubkey')), '$bigkey' => salmon_key(get_config('system','site_pubkey')),
)); ));
session_write_close();
exit(); exit();
} }