aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/session.php6
2 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 73a86748c8..3b327a646a 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -276,6 +276,7 @@ p a {
<li>[Fix] Do not overwrite larger memory values in the installer (Bug #12195)</li>
<li>[Fix] Order forums on role permission mask (Bug #12337)</li>
<li>[Fix] Show "no image" image when a non-selectable item was selected in the acp imageset editor - IE (Bug #12423)</li>
+ <li>[Fix] Update session information without new pageload (Bug #12393, Bug #12441)</li>
</ul>
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'))