aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_disallow.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/acp/acp_disallow.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/acp/acp_disallow.php')
-rw-r--r--phpBB/includes/acp/acp_disallow.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_disallow.php b/phpBB/includes/acp/acp_disallow.php
index adcaa13e4d..2c27616748 100644
--- a/phpBB/includes/acp/acp_disallow.php
+++ b/phpBB/includes/acp/acp_disallow.php
@@ -25,7 +25,7 @@ class acp_disallow
function main($id, $mode)
{
- global $db, $user, $auth, $template, $cache, $phpbb_log;
+ global $db, $user, $auth, $template, $cache, $phpbb_log, $request;
global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
@@ -49,7 +49,7 @@ class acp_disallow
if ($disallow)
{
- $disallowed_user = str_replace('*', '%', utf8_normalize_nfc(request_var('disallowed_user', '', true)));
+ $disallowed_user = str_replace('*', '%', $request->variable('disallowed_user', '', true));
if (!$disallowed_user)
{
@@ -80,7 +80,7 @@ class acp_disallow
}
else if ($allow)
{
- $disallowed_id = request_var('disallowed_id', 0);
+ $disallowed_id = $request->variable('disallowed_id', 0);
if (!$disallowed_id)
{