diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-08 13:56:39 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-08 13:56:39 -0600 |
| commit | 2227ceab8bf0cccf95598f4e2a59cc7134adf7f0 (patch) | |
| tree | 4b96041071ffcdba6d91aa6723dd8ef89646d748 | |
| parent | 6b7443adacfa8e79304e4c91ca02000d25259633 (diff) | |
| download | forums-2227ceab8bf0cccf95598f4e2a59cc7134adf7f0.tar forums-2227ceab8bf0cccf95598f4e2a59cc7134adf7f0.tar.gz forums-2227ceab8bf0cccf95598f4e2a59cc7134adf7f0.tar.bz2 forums-2227ceab8bf0cccf95598f4e2a59cc7134adf7f0.tar.xz forums-2227ceab8bf0cccf95598f4e2a59cc7134adf7f0.zip | |
[ticket/11103] Use $request->variable rather than request_var
PHPBB3-11103
| -rw-r--r-- | phpBB/includes/ucp/ucp_notifications.php | 8 | ||||
| -rw-r--r-- | phpBB/index.php | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php index e8ceac3f59..76fc411584 100644 --- a/phpBB/includes/ucp/ucp_notifications.php +++ b/phpBB/includes/ucp/ucp_notifications.php @@ -26,8 +26,8 @@ class ucp_notifications add_form_key('ucp_notification'); - $start = request_var('start', 0); - $form_time = min(request_var('form_time', 0), time()); + $start = $request->variable('start', 0); + $form_time = min($request->variable('form_time', 0), time()); switch ($mode) { @@ -87,7 +87,7 @@ class ucp_notifications case 'notification_list': default: // Mark all items read - if (request_var('mark', '') == 'all' && (confirm_box(true) || check_link_hash(request_var('token', ''), 'mark_all_notifications_read'))) + if ($request->variable('mark', '') == 'all' && (confirm_box(true) || check_link_hash($request->variable('token', ''), 'mark_all_notifications_read'))) { if (confirm_box(true)) { @@ -114,7 +114,7 @@ class ucp_notifications trigger_error('FORM_INVALID'); } - $mark_read = request_var('mark', array(0)); + $mark_read = $request->variable('mark', array(0)); if (!empty($mark_read)) { diff --git a/phpBB/index.php b/phpBB/index.php index 94b2b17084..5e76d653eb 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -25,7 +25,7 @@ $auth->acl($user->data); $user->setup('viewforum'); // Mark notifications read -if (($mark_notification = request_var('mark_notification', 0))) +if (($mark_notification = $request->variable('mark_notification', 0))) { $notification = $phpbb_notifications->load_notifications(array( 'notification_id' => $mark_notification @@ -37,7 +37,7 @@ if (($mark_notification = request_var('mark_notification', 0))) $notification->mark_read(); - if (($redirect = request_var('redirect', ''))) + if (($redirect = $request->variable('redirect', ''))) { redirect(append_sid($phpbb_root_path . $redirect)); } |