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/functions_display.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/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 98f1fdef13..71aee5d8e3 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -23,6 +23,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod { global $db, $auth, $user, $template; global $phpbb_root_path, $phpEx, $config; + global $request; $forum_rows = $subforums = $forum_ids = $forum_ids_moderator = $forum_moderators = $active_forum_ary = array(); $parent_id = $visible_forums = 0; @@ -69,7 +70,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod } else if ($config['load_anon_lastread'] || $user->data['is_registered']) { - $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(); if (!$user->data['is_registered']) |