diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-09-22 21:58:20 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-09-25 20:32:15 +0200 |
| commit | fccd7f0ab5ab559dc89be6af9e582a986af8bb13 (patch) | |
| tree | 65b2c96dc13203a75f104d3ee2b79b0756bc4631 /phpBB/includes/functions_display.php | |
| parent | 15883dfac22c8a5660c0400c565ba980eaf6f618 (diff) | |
| download | forums-fccd7f0ab5ab559dc89be6af9e582a986af8bb13.tar forums-fccd7f0ab5ab559dc89be6af9e582a986af8bb13.tar.gz forums-fccd7f0ab5ab559dc89be6af9e582a986af8bb13.tar.bz2 forums-fccd7f0ab5ab559dc89be6af9e582a986af8bb13.tar.xz forums-fccd7f0ab5ab559dc89be6af9e582a986af8bb13.zip | |
[feature/request-class] Convert any direct access to $_* to use $request
PHPBB3-9716
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 2de7e1b169..7f9070740f 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1062,6 +1062,7 @@ function display_user_activity(&$userdata) function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, $notify_status = 'unset', $start = 0) { global $template, $db, $user, $phpEx, $start, $phpbb_root_path; + global $request; $table_sql = ($mode == 'forum') ? FORUMS_WATCH_TABLE : TOPICS_WATCH_TABLE; $where_sql = ($mode == 'forum') ? 'forum_id' : 'topic_id'; @@ -1098,7 +1099,7 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, $message = $user->lang['ERR_UNWATCHING'] . '<br /><br />' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '<a href="' . $redirect_url . '">', '</a>'); trigger_error($message); } - if ($_GET['unwatch'] == $mode) + if ($request->variable('unwatch', '', false, phpbb_request_interface::GET) == $mode) { $is_watching = 0; @@ -1136,7 +1137,7 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, $token = request_var('hash', ''); $redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start"); - if ($_GET['watch'] == $mode && check_link_hash($token, "{$mode}_$match_id")) + if ($request->variable('watch', '', false, phpbb_request_interface::GET) == $mode && check_link_hash($token, "{$mode}_$match_id")) { $is_watching = true; @@ -1162,7 +1163,7 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, } else { - if (isset($_GET['unwatch']) && $_GET['unwatch'] == $mode) + if ($request->variable('unwatch', '', false, phpbb_request_interface::GET) == $mode) { login_box(); } |