diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-07 12:50:55 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-07 12:50:55 +0200 |
| commit | 54ccea93127b52c99f9ca4972fd8f12dc459bba5 (patch) | |
| tree | cfba75b0775e1c5116375ff79c711c4f577812f4 /phpBB/phpbb | |
| parent | 8ed0f94e31931791bec4894b93719079aa8e41f0 (diff) | |
| parent | 12398d65fd52b1cec93d5aaccf933a9ba3eb93a0 (diff) | |
| download | forums-54ccea93127b52c99f9ca4972fd8f12dc459bba5.tar forums-54ccea93127b52c99f9ca4972fd8f12dc459bba5.tar.gz forums-54ccea93127b52c99f9ca4972fd8f12dc459bba5.tar.bz2 forums-54ccea93127b52c99f9ca4972fd8f12dc459bba5.tar.xz forums-54ccea93127b52c99f9ca4972fd8f12dc459bba5.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/13048] Only update session_page if request is not ajax
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/session.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 7d564742af..30b364821d 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -441,8 +441,8 @@ class session if (!$session_expired) { - // 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'])) + // 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()) { $sql_ary = array('session_time' => $this->time_now); |