aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_main.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2010-12-16 02:22:17 +0100
committerAndreas Fischer <bantu@phpbb.com>2010-12-16 02:22:17 +0100
commit442fc61be77787c211650f21b2fb485f5e6ffcf0 (patch)
tree804ce33f487ab3f9d1ed19db203a91522d4dd184 /phpBB/includes/ucp/ucp_main.php
parent8b9b1f118726e9fb088737129a02e9959ac1adc4 (diff)
parentb08e0d17728f8733a403834a8ffa85b01c16d805 (diff)
downloadforums-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/ucp/ucp_main.php')
-rw-r--r--phpBB/includes/ucp/ucp_main.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php
index 64bed60248..d5bdb731ac 100644
--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -288,7 +288,7 @@ class ucp_main
}
else
{
- $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_track'])) ? ((STRIP) ? stripslashes($_COOKIE[$config['cookie_name'] . '_track']) : $_COOKIE[$config['cookie_name'] . '_track']) : '';
+ $tracking_topics = $request->variable($config['cookie_name'] . '_track', '', true, phpbb_request_interface::COOKIE);
$tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
}