Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-06-19 18:38:25 +02:00
commit 9b748631ed

View file

@ -104,7 +104,7 @@ class mcp_queue
if (!empty($topic_id_list) && $mode == 'deleted_topics') if (!empty($topic_id_list) && $mode == 'deleted_topics')
{ {
if (!function_exists('mcp_delete_topics')) if (!function_exists('mcp_delete_topic'))
{ {
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
include($phpbb_root_path . 'includes/mcp/mcp_main.' . $phpEx); include($phpbb_root_path . 'includes/mcp/mcp_main.' . $phpEx);