diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-02-04 21:09:54 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-02-04 21:09:54 +0100 |
| commit | 3267c6a61ad88bf96d6f0159dcb565ded4704e82 (patch) | |
| tree | f7bfb53911f454dfa75cb2f00a0e1395dedbe44f /phpBB/includes/mcp/mcp_notes.php | |
| parent | f9ab676530b862798f3eea6bf53415ca3b0faff8 (diff) | |
| parent | 52446c8327426c59da74257885fd09591c9e1fb3 (diff) | |
| download | forums-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/mcp/mcp_notes.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_notes.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php index 4fd17ccf48..502d4cb1e7 100644 --- a/phpBB/includes/mcp/mcp_notes.php +++ b/phpBB/includes/mcp/mcp_notes.php @@ -35,10 +35,10 @@ class mcp_notes function main($id, $mode) { - global $auth, $db, $user, $template; + global $auth, $db, $user, $template, $request; global $config, $phpbb_root_path, $phpEx; - $action = request_var('action', array('' => '')); + $action = $request->variable('action', array('' => '')); if (is_array($action)) { @@ -74,15 +74,15 @@ class mcp_notes */ function mcp_notes_user_view($action) { - global $phpEx, $phpbb_root_path, $config, $phpbb_log; + global $phpEx, $phpbb_root_path, $config, $phpbb_log, $request; global $template, $db, $user, $auth, $phpbb_container; - $user_id = request_var('u', 0); - $username = request_var('username', '', true); - $start = request_var('start', 0); - $st = request_var('st', 0); - $sk = request_var('sk', 'b'); - $sd = request_var('sd', 'd'); + $user_id = $request->variable('u', 0); + $username = $request->variable('username', '', true); + $start = $request->variable('start', 0); + $st = $request->variable('st', 0); + $sk = $request->variable('sk', 'b'); + $sd = $request->variable('sd', 'd'); /* @var $pagination \phpbb\pagination */ $pagination = $phpbb_container->get('pagination'); @@ -116,8 +116,8 @@ class mcp_notes $deletemark = ($action == 'del_marked') ? true : false; $deleteall = ($action == 'del_all') ? true : false; - $marked = request_var('marknote', array(0)); - $usernote = utf8_normalize_nfc(request_var('usernote', '', true)); + $marked = $request->variable('marknote', array(0)); + $usernote = $request->variable('usernote', '', true); // Handle any actions if (($deletemark || $deleteall) && $auth->acl_get('a_clearlogs')) @@ -201,7 +201,7 @@ class mcp_notes $sql_where = ($st) ? (time() - ($st * 86400)) : 0; $sql_sort = $sort_by_sql[$sk] . ' ' . (($sd == 'd') ? 'DESC' : 'ASC'); - $keywords = utf8_normalize_nfc(request_var('keywords', '', true)); + $keywords = $request->variable('keywords', '', true); $keywords_param = !empty($keywords) ? '&keywords=' . urlencode(htmlspecialchars_decode($keywords)) : ''; $log_data = array(); |