diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-06-09 15:24:08 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-06-09 15:24:08 +0200 |
| commit | b2ada8ba090f077678ffd67768ea4038e9bd0a06 (patch) | |
| tree | 0232143f8f335208b4fc8bd5001500cc39f79e49 /phpBB/includes/mcp | |
| parent | d3e55a8290bcec35d7fdf5a00f46ef5bce62e28d (diff) | |
| parent | 072f4c926072ba4c7a64749e6a2a8118048ed83e (diff) | |
| download | forums-b2ada8ba090f077678ffd67768ea4038e9bd0a06.tar forums-b2ada8ba090f077678ffd67768ea4038e9bd0a06.tar.gz forums-b2ada8ba090f077678ffd67768ea4038e9bd0a06.tar.bz2 forums-b2ada8ba090f077678ffd67768ea4038e9bd0a06.tar.xz forums-b2ada8ba090f077678ffd67768ea4038e9bd0a06.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/includes/mcp/mcp_main.php
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_post.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index e8ab0167f5..2659a4bf01 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -1188,7 +1188,7 @@ function mcp_delete_post($post_ids, $is_soft = false, $soft_delete_reason = '', function mcp_fork_topic($topic_ids) { global $auth, $user, $db, $template, $config; - global $phpEx, $phpbb_root_path, $phpbb_log, $request; + global $phpEx, $phpbb_root_path, $phpbb_log, $request, $phpbb_dispatcher; if (!phpbb_check_ids($topic_ids, TOPICS_TABLE, 'topic_id', array('m_'))) { @@ -1266,7 +1266,7 @@ function mcp_fork_topic($topic_ids) } $error = false; - $search = new $search_type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user); + $search = new $search_type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user, $phpbb_dispatcher); $search_mode = 'post'; if ($error) diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index 838252fa22..f7983c57bf 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -538,7 +538,7 @@ function change_poster(&$post_info, $userdata) { // We do some additional checks in the module to ensure it can actually be utilised $error = false; - $search = new $search_type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user); + $search = new $search_type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user, $phpbb_dispatcher); if (!$error && method_exists($search, 'destroy_cache')) { |