makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/13048] Only do not update the session page for ajax requests
This commit is contained in:
Andreas Fischer 2014-09-23 23:29:52 +02:00
commit 138d320960
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/phpbb/session.php
View file

@ -441,12 +441,13 @@ class session
if (!$session_expired) if (!$session_expired)
{ {
// Only update session DB a minute or so after last update or if page changes and is not ajax request // Only update session DB a minute or so after last update or if page changes
if (($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page'])) && !$request->is_ajax()) if ($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page']))
{ {
$sql_ary = array('session_time' => $this->time_now); $sql_ary = array('session_time' => $this->time_now);
if ($this->update_session_page) // Do not update the session page for ajax requests, so the view online still works as intended
if ($this->update_session_page && !$request->is_ajax())
{ {
$sql_ary['session_page'] = substr($this->page['page'], 0, 199); $sql_ary['session_page'] = substr($this->page['page'], 0, 199);
$sql_ary['session_forum_id'] = $this->page['forum']; $sql_ary['session_forum_id'] = $this->page['forum'];