aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/sessions.php
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-01-21 10:44:47 -0500
committerCash Costello <cash.costello@gmail.com>2012-01-21 10:44:47 -0500
commita2cfbdeb100324090ffe19d58aeb71c2def83ac8 (patch)
treeed6b95ea6f9e21101fc467ffe02caaea3eda5975 /engine/lib/sessions.php
parentb6284c6e781275e7d545778fb9ae41ba9107bdaa (diff)
downloadelgg-a2cfbdeb100324090ffe19d58aeb71c2def83ac8.tar.gz
elgg-a2cfbdeb100324090ffe19d58aeb71c2def83ac8.tar.bz2
cleans up the boot process
Diffstat (limited to 'engine/lib/sessions.php')
-rw-r--r--engine/lib/sessions.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/lib/sessions.php b/engine/lib/sessions.php
index 97a05e2e8..9982d9fe8 100644
--- a/engine/lib/sessions.php
+++ b/engine/lib/sessions.php
@@ -355,7 +355,7 @@ function logout() {
session_destroy();
// starting a default session to store any post-logout messages.
- session_init(NULL, NULL, NULL);
+ _elgg_session_boot(NULL, NULL, NULL);
$_SESSION['msg'] = $old_msg;
return TRUE;
@@ -379,7 +379,7 @@ function logout() {
* @return bool
* @access private
*/
-function session_init($event, $object_type, $object) {
+function _elgg_session_boot($event, $object_type, $object) {
global $DB_PREFIX, $CONFIG;
// Use database for sessions
@@ -444,8 +444,8 @@ function session_init($event, $object_type, $object) {
set_last_action($_SESSION['guid']);
}
- elgg_register_action("login", '', 'public');
- elgg_register_action("logout");
+ elgg_register_action('login', '', 'public');
+ elgg_register_action('logout');
// Register a default PAM handler
register_pam_handler('pam_auth_userpass');
@@ -655,4 +655,4 @@ function _elgg_session_gc($maxlifetime) {
return true;
}
-elgg_register_event_handler("boot", "system", "session_init", 20);
+elgg_register_event_handler('boot', 'system', '_elgg_session_boot', 2);