1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 00:40:56 +02:00

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
This commit is contained in:
Henry Sudhof
2007-06-15 17:19:27 +00:00
parent 0f8ec0d2f6
commit 5127dc441a
2 changed files with 5 additions and 2 deletions

View File

@ -276,6 +276,7 @@ p a {
<li>[Fix] Do not overwrite larger memory values in the installer (Bug #12195)</li> <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] 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] 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> </ul>

View File

@ -617,8 +617,10 @@ class session
$this->set_login_key(); $this->set_login_key();
} }
// refresh data
$SID = '?sid=' . $this->session_id; $SID = '?sid=' . $this->session_id;
$_SID = $this->session_id; $_SID = $this->session_id;
$this->data = array_merge($this->data, $sql_ary);
if (!$bot) if (!$bot)
{ {
@ -1507,7 +1509,7 @@ class user extends session
} }
// Make sure the user is able to hide his 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... // Reset online status if not allowed to hide the session...
if (!$auth->acl_get('u_hideonline')) if (!$auth->acl_get('u_hideonline'))