aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_display.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-12-25 14:47:57 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-12-25 14:47:57 +0000
commit5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730 (patch)
treea083f062a59bdacfe913d1cc84d96813037185ec /phpBB/includes/functions_display.php
parentddfef8d832e84eca694bc6d98f2d4ec3ca480142 (diff)
downloadforums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar
forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar.gz
forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar.bz2
forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar.xz
forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.zip
add nils' request and super globals class
rename request:: to phpbb_request:: git-svn-id: file:///svn/phpbb/trunk@9230 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_display.php')
-rw-r--r--phpBB/includes/functions_display.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 9fa6a2bf01..0936279fde 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -68,7 +68,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
}
else if ($config['load_anon_lastread'] || $user->data['is_registered'])
{
- $tracking_topics = request::variable($config['cookie_name'] . '_track', '', false, request::COOKIE);
+ $tracking_topics = phpbb_request::variable($config['cookie_name'] . '_track', '', false, phpbb_request::COOKIE);
$tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
if (!$user->data['is_registered'])
@@ -1044,7 +1044,7 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
if (!is_null($notify_status) && $notify_status !== '')
{
- if (request::is_set('unwatch', request::GET))
+ if (phpbb_request::is_set('unwatch', phpbb_request::GET))
{
$uid = request_var('uid', 0);
if ($uid != $user_id)
@@ -1053,7 +1053,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 (request::variable('unwatch', '', false, request::GET) == $mode)
+ if (phpbb_request::variable('unwatch', '', false, phpbb_request::GET) == $mode)
{
$is_watching = 0;
@@ -1086,12 +1086,12 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
}
else
{
- if (request::is_set('watch', request::GET))
+ if (phpbb_request::is_set('watch', phpbb_request::GET))
{
$token = request_var('hash', '');
$redirect_url = append_sid("view$mode", "$u_url=$match_id&amp;start=$start");
- if (request::variable('watch', '', false, request::GET) == $mode && check_link_hash($token, "{$mode}_$match_id"))
+ if (phpbb_request::variable('watch', '', false, phpbb_request::GET) == $mode && check_link_hash($token, "{$mode}_$match_id"))
{
$is_watching = true;
@@ -1117,7 +1117,7 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
}
else
{
- if (request::variable('unwatch', '', false, request::GET) == $mode)
+ if (phpbb_request::variable('unwatch', '', false, phpbb_request::GET) == $mode)
{
login_box();
}