summaryrefslogtreecommitdiffstats
path: root/lib/init.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/init.php')
-rw-r--r--lib/init.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/init.php b/lib/init.php
index b86c3108..f63c3add 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -144,6 +144,7 @@ require_once $prefix . '/modules/infotools/openstrands.class.php';
$results = Preference::fix_preferences($results);
Config::set_by_array($results,1);
+debug_event('ZZWANG IS',$wang,'1');
// Modules (These are conditionaly included depending upon config values)
if (Config::get('ratings')) {
@@ -219,11 +220,10 @@ elseif (!Config::get('use_auth')) {
// If Auth, but no session is set
else {
if (isset($_REQUEST['sessid'])) {
- $sess_results = vauth::get_session_data($_REQUEST['sessid']);
session_name(Config::get('session_name'));
session_id(scrub_in($_REQUEST['sessid']));
session_start();
- $GLOBALS['user'] = User::get_from_username($sess_results['username']);
+ $GLOBALS['user'] = User::get_from_username($_SESSION['userdata']['username']);
}
else {
$GLOBALS['user'] = new User();
@@ -264,5 +264,4 @@ if (! preg_match('/update\.php/', $_SERVER['PHP_SELF'])) {
// For the XMLRPC stuff
$GLOBALS['xmlrpc_internalencoding'] = Config::get('site_charset');
-
?>