aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_module.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-02-04 21:09:54 +0100
committerAndreas Fischer <bantu@phpbb.com>2015-02-04 21:09:54 +0100
commit3267c6a61ad88bf96d6f0159dcb565ded4704e82 (patch)
treef7bfb53911f454dfa75cb2f00a0e1395dedbe44f /phpBB/includes/functions_module.php
parentf9ab676530b862798f3eea6bf53415ca3b0faff8 (diff)
parent52446c8327426c59da74257885fd09591c9e1fb3 (diff)
downloadforums-3267c6a61ad88bf96d6f0159dcb565ded4704e82.tar
forums-3267c6a61ad88bf96d6f0159dcb565ded4704e82.tar.gz
forums-3267c6a61ad88bf96d6f0159dcb565ded4704e82.tar.bz2
forums-3267c6a61ad88bf96d6f0159dcb565ded4704e82.tar.xz
forums-3267c6a61ad88bf96d6f0159dcb565ded4704e82.zip
Merge pull request #3257 from MGaetan89/ticket/13455
[ticket/13455] Change request_var() calls with $request->variable() * MGaetan89/ticket/13455: [ticket/13455] Remove `request_var()` references from comments [ticket/13455] Remove unnecessary calls to `utf8_normalize_nfc()` [ticket/13455] Update calls to `request_var()`
Diffstat (limited to 'phpBB/includes/functions_module.php')
-rw-r--r--phpBB/includes/functions_module.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index fe9bcdb9d1..d0d09fe9fb 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -480,13 +480,15 @@ class p_master
*/
function set_active($id = false, $mode = false)
{
+ global $request;
+
$icat = false;
$this->active_module = false;
- if (request_var('icat', ''))
+ if ($request->variable('icat', ''))
{
$icat = $id;
- $id = request_var('icat', '');
+ $id = $request->variable('icat', '');
}
// Restore the backslashes in class names
@@ -553,10 +555,10 @@ class p_master
*/
function load_active($mode = false, $module_url = false, $execute_module = true)
{
- global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user, $template;
+ global $phpbb_root_path, $phpbb_admin_path, $phpEx, $user, $template, $request;
$module_path = $this->include_path . $this->p_class;
- $icat = request_var('icat', '');
+ $icat = $request->variable('icat', '');
if ($this->active_module === false)
{