aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/session.php
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2010-10-14 22:03:09 +0200
committerIgor Wiedler <igor@wiedler.ch>2010-10-17 13:56:16 +0200
commitb08e0d17728f8733a403834a8ffa85b01c16d805 (patch)
treea7c18d7c7f4891b7ee82b8c016203a53a1e88cfc /phpBB/includes/session.php
parentde5ef675ace0bf6cf047a5be6bea76fce6e95226 (diff)
downloadforums-b08e0d17728f8733a403834a8ffa85b01c16d805.tar
forums-b08e0d17728f8733a403834a8ffa85b01c16d805.tar.gz
forums-b08e0d17728f8733a403834a8ffa85b01c16d805.tar.bz2
forums-b08e0d17728f8733a403834a8ffa85b01c16d805.tar.xz
forums-b08e0d17728f8733a403834a8ffa85b01c16d805.zip
[feature/request-class] Convert some remaining cookies
Convert some remaining accesses to cookie to use the request class instead. Thanks to bantu for the note. PHPBB3-9716
Diffstat (limited to 'phpBB/includes/session.php')
-rw-r--r--phpBB/includes/session.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 0e6a23762e..f75021b493 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -206,6 +206,7 @@ class session
function session_begin($update_session_page = true)
{
global $phpEx, $SID, $_SID, $_EXTRA_URL, $db, $config, $phpbb_root_path;
+ global $request;
// Give us some basic information
$this->time_now = time();
@@ -241,7 +242,7 @@ class session
$this->forwarded_for = '';
}
- if (isset($_COOKIE[$config['cookie_name'] . '_sid']) || isset($_COOKIE[$config['cookie_name'] . '_u']))
+ if ($request->is_set($config['cookie_name'] . '_sid', phpbb_request_interface::COOKIE) || $request->is_set($config['cookie_name'] . '_u', phpbb_request_interface::COOKIE))
{
$this->cookie_data['u'] = request_var($config['cookie_name'] . '_u', 0, false, true);
$this->cookie_data['k'] = request_var($config['cookie_name'] . '_k', '', false, true);