diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 30be597acb..7c560be284 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -123,6 +123,7 @@
[Fix] Correctly handle unread status of subforums (that are not shown on the index) of forums that are shown on the index. (Bug #14589)
[Fix] Stop users from deleting posts after the edit time has passed or they have been locked. (Bug #19115)
[Fix] Split posts target forum requires 'f_post' now instead of 'm_split'. (Bug #31015)
+ [Fix] Duplicate log messages for deleting a topic ('LOG_TOPIC_DELETED' has been deprecated in favour of 'LOG_DELETE_TOPIC').
[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.
[Change] Display warning in ACP if config.php file is left writable.
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 1b6a26dc07..07ec84f0de 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -781,7 +781,7 @@ function mcp_delete_topic($topic_ids)
foreach ($data as $topic_id => $row)
{
- add_log('mod', $row['forum_id'], 0, 'LOG_TOPIC_DELETED', $row['topic_title']);
+ add_log('mod', $row['forum_id'], $topic_id, 'LOG_DELETED_TOPIC', $row['topic_title']);
}
$return = delete_topics('topic_id', $topic_ids);
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 06b30cf03b..cb3442e9a9 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -488,7 +488,6 @@ $lang = array_merge($lang, array(
'LOG_SPLIT_DESTINATION' => 'Moved split posts
» to %s',
'LOG_SPLIT_SOURCE' => 'Split posts
» from %s',
- 'LOG_TOPIC_DELETED' => 'Deleted topic
» %s',
'LOG_TOPIC_APPROVED' => 'Approved topic
» %s',
'LOG_TOPIC_DISAPPROVED' => 'Disapproved topic “%1$s” with the following reason
%2$s',
'LOG_TOPIC_RESYNC' => 'Resynchronised topic counters
» %s',
@@ -688,4 +687,9 @@ $lang = array_merge($lang, array(
'LOG_WORD_EDIT' => 'Edited word censor
» %s',
));
+// Two language keys with the same text were used in different locations
+// LOG_DELETE_TOPIC is the correct one, this line is here so that existing
+// log entries are not broken. Ensure it is included in your language file.
+$lang['LOG_TOPIC_DELETED'] = $lang['LOG_DELETE_TOPIC'];
+
?>
\ No newline at end of file