diff options
| author | Wesley Fok <wesley.fok@yp.ca> | 2016-08-03 13:27:06 -0400 |
|---|---|---|
| committer | Wesley Fok <wesley.fok@yp.ca> | 2016-08-03 13:27:06 -0400 |
| commit | 3038bf5eafa4680a96ec1140334d3a22b1ecc154 (patch) | |
| tree | d96f00779edee67f1d41dae2113daad79ad61080 /phpBB/includes/ucp | |
| parent | ba13832085bf05eb5ab19aeb9681b16c7a119df9 (diff) | |
| download | forums-3038bf5eafa4680a96ec1140334d3a22b1ecc154.tar forums-3038bf5eafa4680a96ec1140334d3a22b1ecc154.tar.gz forums-3038bf5eafa4680a96ec1140334d3a22b1ecc154.tar.bz2 forums-3038bf5eafa4680a96ec1140334d3a22b1ecc154.tar.xz forums-3038bf5eafa4680a96ec1140334d3a22b1ecc154.zip | |
[ticket/14638] Rollback changes from 3.2.x version
Mistakenly brought in the modified 3.2.x version verbatim instead of diffing
against the 3.1.x version of ucp_main.php. Removed any changes I didn't
explicitly make.
PHPBB3-14638
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_main.php | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/includes/ucp/ucp_main.php index 77ac1dfb54..8584a9a0fd 100644 --- a/phpBB/includes/ucp/ucp_main.php +++ b/phpBB/includes/ucp/ucp_main.php @@ -227,8 +227,9 @@ class ucp_main { if (check_form_key('ucp_front_subscribed')) { - $forums = array_keys($request->variable('f', array(0 => 0))); - $topics = array_keys($request->variable('t', array(0 => 0))); + $forums = array_keys(request_var('f', array(0 => 0))); + $topics = array_keys(request_var('t', array(0 => 0))); + $msg = ''; if (sizeof($forums) || sizeof($topics)) { @@ -450,7 +451,7 @@ class ucp_main if (isset($_POST['unbookmark'])) { $s_hidden_fields = array('unbookmark' => 1); - $topics = (isset($_POST['t'])) ? array_keys($request->variable('t', array(0 => 0))) : array(); + $topics = (isset($_POST['t'])) ? array_keys(request_var('t', array(0 => 0))) : array(); $url = $this->u_action; if (!sizeof($topics)) @@ -506,7 +507,7 @@ class ucp_main { if (check_form_key('ucp_draft')) { - $drafts = array_keys($request->variable('d', array(0 => 0))); + $drafts = array_keys(request_var('d', array(0 => 0))); if (sizeof($drafts)) { @@ -529,8 +530,8 @@ class ucp_main if ($submit && $edit) { - $draft_subject = $request->variable('subject', '', true); - $draft_message = $request->variable('message', '', true); + $draft_subject = utf8_normalize_nfc(request_var('subject', '', true)); + $draft_message = utf8_normalize_nfc(request_var('message', '', true)); if (check_form_key('ucp_draft')) { if ($draft_message && $draft_subject) @@ -694,10 +695,9 @@ class ucp_main { global $user, $db, $template, $config, $cache, $auth, $phpbb_root_path, $phpEx, $phpbb_container, $request, $phpbb_dispatcher; - /* @var $pagination \phpbb\pagination */ - $pagination = $phpbb_container->get('pagination'); $table = ($mode == 'subscribed') ? TOPICS_WATCH_TABLE : BOOKMARKS_TABLE; - $start = $request->variable('start', 0); + $start = request_var('start', 0); + $pagination = $phpbb_container->get('pagination'); // Grab icons $icons = $cache->obtain_icons(); @@ -852,7 +852,6 @@ class ucp_main } } - /* @var $phpbb_content_visibility \phpbb\content_visibility */ $phpbb_content_visibility = $phpbb_container->get('content.visibility'); foreach ($topic_list as $topic_id) |