diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-12-16 02:22:17 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-12-16 02:22:17 +0100 |
| commit | 442fc61be77787c211650f21b2fb485f5e6ffcf0 (patch) | |
| tree | 804ce33f487ab3f9d1ed19db203a91522d4dd184 /phpBB/includes/session.php | |
| parent | 8b9b1f118726e9fb088737129a02e9959ac1adc4 (diff) | |
| parent | b08e0d17728f8733a403834a8ffa85b01c16d805 (diff) | |
| download | forums-442fc61be77787c211650f21b2fb485f5e6ffcf0.tar forums-442fc61be77787c211650f21b2fb485f5e6ffcf0.tar.gz forums-442fc61be77787c211650f21b2fb485f5e6ffcf0.tar.bz2 forums-442fc61be77787c211650f21b2fb485f5e6ffcf0.tar.xz forums-442fc61be77787c211650f21b2fb485f5e6ffcf0.zip | |
Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class:
[feature/request-class] Convert some remaining cookies
[feature/request-class] Adjust misleading comment
[feature/request-class] Remove direct access to _REQUEST in acp_search
[feature/request-class] Special case of direct access to _REQUEST
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 73e0803d5d..d2f76868c1 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); |