aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-09-23 23:29:52 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-09-23 23:29:52 +0200
commit9feb7096eeb579fb6e0d7416de425a1f5bde5ad4 (patch)
tree92f3264ea237c8e625b41e336549f61bfede64c3
parent34aad4046fa5e15522b12e069862327de2aa0f36 (diff)
parent820db008ffc24fcad1c36e9c736847f5d5a0254d (diff)
downloadforums-9feb7096eeb579fb6e0d7416de425a1f5bde5ad4.tar
forums-9feb7096eeb579fb6e0d7416de425a1f5bde5ad4.tar.gz
forums-9feb7096eeb579fb6e0d7416de425a1f5bde5ad4.tar.bz2
forums-9feb7096eeb579fb6e0d7416de425a1f5bde5ad4.tar.xz
forums-9feb7096eeb579fb6e0d7416de425a1f5bde5ad4.zip
Merge pull request #2985 from nickvergessen/ticket/13048
[ticket/13048] Only do not update the session page for ajax requests * nickvergessen/ticket/13048: [ticket/13048] Only do not update the session page for ajax requests
-rw-r--r--phpBB/phpbb/session.php7
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'];