diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2015-01-14 12:34:28 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2015-01-14 12:34:28 +0100 |
| commit | 98937a7a18dc605c6d3bb8a3f20f124ec71e058a (patch) | |
| tree | 188b7b5c0741a7fd5ea54d322b9f394a21c1fe28 /phpBB/includes/mcp/mcp_topic.php | |
| parent | 853733a0eb04f917fe3195ed9f36cfcf643deffd (diff) | |
| parent | b5544b2f471ce4c93b08d19919ab062725545ce8 (diff) | |
| download | forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar.gz forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar.bz2 forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.tar.xz forums-98937a7a18dc605c6d3bb8a3f20f124ec71e058a.zip | |
Merge pull request #3289 from MGaetan89/ticket/13450
[ticket/13450] Type-hint return value of $phpbb_container->get()
* MGaetan89/ticket/13450:
[ticket/13450] Type-hint return value of $phpbb_container->get()
Diffstat (limited to 'phpBB/includes/mcp/mcp_topic.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_topic.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index 1698b080c9..08002fa952 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -29,8 +29,9 @@ function mcp_topic_view($id, $mode, $action) $url = append_sid("{$phpbb_root_path}mcp.$phpEx?" . phpbb_extra_url()); - $user->add_lang('viewtopic'); + /* @var $pagination \phpbb\pagination */ $pagination = $phpbb_container->get('pagination'); + $user->add_lang('viewtopic'); $topic_id = request_var('t', 0); $topic_info = phpbb_get_topic_data(array($topic_id), false, true); @@ -116,8 +117,9 @@ function mcp_topic_view($id, $mode, $action) $sort_by_sql = $sort_order_sql = array(); phpbb_mcp_sorting('viewtopic', $sort_days, $sort_key, $sort_dir, $sort_by_sql, $sort_order_sql, $total, $topic_info['forum_id'], $topic_id, $where_sql); - $limit_time_sql = ($sort_days) ? 'AND p.post_time >= ' . (time() - ($sort_days * 86400)) : ''; + /* @var $phpbb_content_visibility \phpbb\content_visibility */ $phpbb_content_visibility = $phpbb_container->get('content.visibility'); + $limit_time_sql = ($sort_days) ? 'AND p.post_time >= ' . (time() - ($sort_days * 86400)) : ''; if ($total == -1) { |