aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/session.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-01-13 09:27:35 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-01-13 09:27:35 +0100
commitd55a8a8ceeae5336a391299d5bb31489f261c836 (patch)
treeba6eaaf7a39ac36f37b823438c8b63931fb65ad2 /phpBB/phpbb/session.php
parent549e91354d83ba9762431cc81c94fe5092d23bfb (diff)
parentf979d2c7b2f93bc734ae7b87debb4457f62ea24c (diff)
downloadforums-d55a8a8ceeae5336a391299d5bb31489f261c836.tar
forums-d55a8a8ceeae5336a391299d5bb31489f261c836.tar.gz
forums-d55a8a8ceeae5336a391299d5bb31489f261c836.tar.bz2
forums-d55a8a8ceeae5336a391299d5bb31489f261c836.tar.xz
forums-d55a8a8ceeae5336a391299d5bb31489f261c836.zip
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/phpbb/session.php')
-rw-r--r--phpBB/phpbb/session.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index 6155745c37..3f7146c59b 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -1574,7 +1574,7 @@ class session
public function update_session_infos()
{
- global $db, $request;
+ global $config, $db, $request;
// No need to update if it's a new session. Informations are already inserted by session_create()
if (isset($this->data['session_created']) && $this->data['session_created'])