aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-09 22:28:54 -0700
committerredmatrix <git@macgirvin.com>2016-05-09 22:28:54 -0700
commitbaa7020036f4b6112a58a99d04af2f5287a8c815 (patch)
tree56c502ca4af2d883d4575696c284283fd60ecfe7
parentf658a3cae135070887d3df48151177778371d0e2 (diff)
downloadvolse-hubzilla-baa7020036f4b6112a58a99d04af2f5287a8c815.tar.gz
volse-hubzilla-baa7020036f4b6112a58a99d04af2f5287a8c815.tar.bz2
volse-hubzilla-baa7020036f4b6112a58a99d04af2f5287a8c815.zip
revert shutdown function
-rw-r--r--Zotlabs/Module/Manage.php4
-rwxr-xr-xboot.php2
2 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Module/Manage.php b/Zotlabs/Module/Manage.php
index fee202263..5ae79dbb2 100644
--- a/Zotlabs/Module/Manage.php
+++ b/Zotlabs/Module/Manage.php
@@ -28,10 +28,12 @@ class Manage extends \Zotlabs\Web\Controller {
}
goaway(z_root() . '/manage');
}
+
if($change_channel) {
+
$r = change_channel($change_channel);
-
+
if((argc() > 2) && !(argv(2) === 'default')) {
goaway(z_root() . '/' . implode('/',array_slice(\App::$argv,2))); // Go to whatever is after /manage/, but with the new channel
}
diff --git a/boot.php b/boot.php
index 4e3412ac0..ebf743274 100755
--- a/boot.php
+++ b/boot.php
@@ -1633,7 +1633,7 @@ function login($register = false, $form_id = 'main-login', $hiddens=false) {
* @brief Used to end the current process, after saving session state.
*/
function killme() {
- register_shutdown_function('shutdown');
+// register_shutdown_function('shutdown');
exit;
}