diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-01-07 14:37:19 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-01-07 14:37:19 +0000 |
| commit | 7bdb2816f9855a1675c25b152e3c0cadd9ee57ae (patch) | |
| tree | a281bb78eb14a6efd36df7d077b23aff27bec6c1 /phpBB/includes/session.php | |
| parent | b369a1e43cdeb9edeee8b4c86fbc395c7bb5d202 (diff) | |
| download | forums-7bdb2816f9855a1675c25b152e3c0cadd9ee57ae.tar forums-7bdb2816f9855a1675c25b152e3c0cadd9ee57ae.tar.gz forums-7bdb2816f9855a1675c25b152e3c0cadd9ee57ae.tar.bz2 forums-7bdb2816f9855a1675c25b152e3c0cadd9ee57ae.tar.xz forums-7bdb2816f9855a1675c25b152e3c0cadd9ee57ae.zip | |
Various updates
git-svn-id: file:///svn/phpbb/trunk@3262 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index d32aceafa8..7def737c02 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -43,6 +43,7 @@ class session $sessiondata = ( isset($_COOKIE[$config['cookie_name'] . '_data']) ) ? unserialize(stripslashes($_COOKIE[$config['cookie_name'] . '_data'])) : ''; $this->session_id = ( isset($_COOKIE[$config['cookie_name'] . '_sid']) ) ? $_COOKIE[$config['cookie_name'] . '_sid'] : ''; $SID = (defined('IN_ADMIN')) ? '?sid=' . $this->session_id : '?sid='; +// $SID = (defined('ADD_SID')) ? '?sid=' . $this->session_id : '?sid='; } else { @@ -408,6 +409,7 @@ class user extends session include($this->lang_path . '/' . $lang_set . '.' . $phpEx); } */ + // Set up style $style = ($style) ? $style : ((!$config['override_user_style'] && $this->data['user_id'] != ANONYMOUS) ? $this->data['user_style'] : $config['default_style']); |