diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-23 15:25:40 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-23 15:25:40 +0200 |
| commit | 820db008ffc24fcad1c36e9c736847f5d5a0254d (patch) | |
| tree | 22f13591ac68539ff0008499ba71dd05ed70d276 /phpBB/phpbb/session.php | |
| parent | 05ae3275539ab514f9742e5f38eef9c56b6b53b9 (diff) | |
| download | forums-820db008ffc24fcad1c36e9c736847f5d5a0254d.tar forums-820db008ffc24fcad1c36e9c736847f5d5a0254d.tar.gz forums-820db008ffc24fcad1c36e9c736847f5d5a0254d.tar.bz2 forums-820db008ffc24fcad1c36e9c736847f5d5a0254d.tar.xz forums-820db008ffc24fcad1c36e9c736847f5d5a0254d.zip | |
[ticket/13048] Only do not update the session page for ajax requests
The session time still needs to be updated, so e.g. long upload times
with PLupload stop the session from timing out.
PHPBB3-13048
Diffstat (limited to 'phpBB/phpbb/session.php')
| -rw-r--r-- | phpBB/phpbb/session.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 30b364821d..da8b848fa5 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -441,12 +441,13 @@ class session if (!$session_expired) { - // Only update session DB a minute or so after last update or if page changes and is not ajax request - if (($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page'])) && !$request->is_ajax()) + // 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'])) { $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_forum_id'] = $this->page['forum']; |