diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-06-15 17:19:27 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-06-15 17:19:27 +0000 |
| commit | 5127dc441a6fbfcd7b8427f3bf84b27d104eaff4 (patch) | |
| tree | 1c070c0cfb53354c68769bb4adff9b2d84c85e6d /phpBB/includes | |
| parent | 0f8ec0d2f6f86ce6e4fba8153ec1aafee791175e (diff) | |
| download | forums-5127dc441a6fbfcd7b8427f3bf84b27d104eaff4.tar forums-5127dc441a6fbfcd7b8427f3bf84b27d104eaff4.tar.gz forums-5127dc441a6fbfcd7b8427f3bf84b27d104eaff4.tar.bz2 forums-5127dc441a6fbfcd7b8427f3bf84b27d104eaff4.tar.xz forums-5127dc441a6fbfcd7b8427f3bf84b27d104eaff4.zip | |
This should be a better fix for #12441
Should also fix #12393
git-svn-id: file:///svn/phpbb/trunk@7763 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/session.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index ebc8852beb..29d364e89b 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -617,8 +617,10 @@ class session $this->set_login_key(); } + // refresh data $SID = '?sid=' . $this->session_id; $_SID = $this->session_id; + $this->data = array_merge($this->data, $sql_ary); if (!$bot) { @@ -643,7 +645,7 @@ class session $SID = '?sid='; $_SID = ''; } - + return true; } @@ -1507,7 +1509,7 @@ class user extends session } // Make sure the user is able to hide his session - if (isset($this->data['session_viewonline']) && !$this->data['session_viewonline']) + if (!$this->data['session_viewonline']) { // Reset online status if not allowed to hide the session... if (!$auth->acl_get('u_hideonline')) |