aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/classes
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/classes
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/classes')
-rw-r--r--phpBB/includes/classes/session.php4
-rw-r--r--phpBB/includes/classes/user.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/classes/session.php b/phpBB/includes/classes/session.php
index b8f829efd5..5a42fdaac2 100644
--- a/phpBB/includes/classes/session.php
+++ b/phpBB/includes/classes/session.php
@@ -128,7 +128,7 @@ abstract class phpbb_session
$this->cookie_data = array('u' => 0, 'k' => '');
$this->update_session_page = $update_session_page;
- if (request::is_set(phpbb::$config['cookie_name'] . '_sid', request::COOKIE) || request::is_set(phpbb::$config['cookie_name'] . '_u', request::COOKIE))
+ if (phpbb_request::is_set(phpbb::$config['cookie_name'] . '_sid', phpbb_request::COOKIE) || phpbb_request::is_set(phpbb::$config['cookie_name'] . '_u', phpbb_request::COOKIE))
{
$this->cookie_data['u'] = request_var(phpbb::$config['cookie_name'] . '_u', 0, false, true);
$this->cookie_data['k'] = request_var(phpbb::$config['cookie_name'] . '_k', '', false, true);
@@ -1017,7 +1017,7 @@ abstract class phpbb_session
private function session_exist()
{
// If session is empty or does not match the session within the URL (if required - set by NEED_SID), then we need a new session
- if (empty($this->session_id) || ($this->need_sid && $this->session_id !== request::variable('sid', '', false, request::GET)))
+ if (empty($this->session_id) || ($this->need_sid && $this->session_id !== phpbb_request::variable('sid', '', false, phpbb_request::GET)))
{
return false;
}
diff --git a/phpBB/includes/classes/user.php b/phpBB/includes/classes/user.php
index 22e2b5acd4..067d97e8cb 100644
--- a/phpBB/includes/classes/user.php
+++ b/phpBB/includes/classes/user.php
@@ -229,7 +229,7 @@ class phpbb_user extends phpbb_session
$this->add_lang($lang_set);
unset($lang_set);
- if (request::variable('style', false, false, request::GET) && phpbb::$acl->acl_get('a_styles'))
+ if (phpbb_request::variable('style', false, false, phpbb_request::GET) && phpbb::$acl->acl_get('a_styles'))
{
$style = request_var('style', 0);
$this->extra_url = array('style=' . $style);