1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-13 04:13:29 +02:00

Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2020-12-22 21:30:27 +01:00
commit 87cd5260d7
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

@ -333,12 +333,6 @@ $template->assign_block_vars('navlinks', array(
'U_BREADCRUMB' => append_sid("{$phpbb_root_path}mcp.$phpEx"),
));
// Load and execute the relevant module
$module->load_active();
// Assign data to the template engine for the list of modules
$module->assign_tpl_vars(append_sid("{$phpbb_root_path}mcp.$phpEx"));
// Generate urls for letting the moderation control panel being accessed in different modes
$template->assign_vars(array(
'U_MCP' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main'),
@ -347,5 +341,11 @@ $template->assign_vars(array(
'U_MCP_POST' => ($forum_id && $topic_id && $post_id) ? append_sid("{$phpbb_root_path}mcp.$phpEx", "i=main&mode=post_details&t=$topic_id&p=$post_id") : '',
));
// Load and execute the relevant module
$module->load_active();
// Assign data to the template engine for the list of modules
$module->assign_tpl_vars(append_sid("{$phpbb_root_path}mcp.$phpEx"));
// Generate the page, do not display/query online list
$module->display($module->get_page_title());