diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-09-23 23:29:52 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-09-23 23:29:52 +0200 |
| commit | 138d3209607aa7d0710629a166423dc057e61f03 (patch) | |
| tree | 2f375ba2381cb04e6c5d283d6a16048d558bbfd3 /phpBB/phpbb | |
| parent | f20e3e9febbce2c871cb3810c9b03388c3751a99 (diff) | |
| parent | 9feb7096eeb579fb6e0d7416de425a1f5bde5ad4 (diff) | |
| download | forums-138d3209607aa7d0710629a166423dc057e61f03.tar forums-138d3209607aa7d0710629a166423dc057e61f03.tar.gz forums-138d3209607aa7d0710629a166423dc057e61f03.tar.bz2 forums-138d3209607aa7d0710629a166423dc057e61f03.tar.xz forums-138d3209607aa7d0710629a166423dc057e61f03.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13048] Only do not update the session page for ajax requests
Diffstat (limited to 'phpBB/phpbb')
| -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']; |