diff options
| author | Daniel Sinn <daniel.p.sinn@gmail.com> | 2016-09-30 16:34:11 -0400 |
|---|---|---|
| committer | Daniel Sinn <daniel.p.sinn@gmail.com> | 2016-09-30 16:34:11 -0400 |
| commit | 32d569c59464a80eb8c78a98b1953de0aa1008d8 (patch) | |
| tree | 53f9d40bca10cdce90ced7e562a2c1567247e3a4 /phpBB/includes/mcp | |
| parent | c6383d3f89c79200253f7d82ebca39f1e3b0393c (diff) | |
| download | forums-32d569c59464a80eb8c78a98b1953de0aa1008d8.tar forums-32d569c59464a80eb8c78a98b1953de0aa1008d8.tar.gz forums-32d569c59464a80eb8c78a98b1953de0aa1008d8.tar.bz2 forums-32d569c59464a80eb8c78a98b1953de0aa1008d8.tar.xz forums-32d569c59464a80eb8c78a98b1953de0aa1008d8.zip | |
[ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1
PHPBB3-14804
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index f887a6d5ea..87f2e558f5 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -476,7 +476,7 @@ function merge_topics($forum_id, $topic_ids, $to_topic_id) $to_forum_id = $to_topic_data['forum_id']; move_posts($post_id_list, $to_topic_id, false); - add_log('mod', $to_forum_id, $to_topic_id, 'LOG_MERGE', $topic_data['topic_title']); + add_log('mod', $to_forum_id, $to_topic_id, 'LOG_MERGE', $to_topic_data['topic_title']); // Message and return links $success_msg = 'POSTS_MERGED_SUCCESS'; |