diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-09-26 12:42:47 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-09-26 12:42:47 +0000 |
| commit | c0f6538cf6d9f6f0aca04cd97b9ed94457f72ad4 (patch) | |
| tree | dc7fa3dd2a814292a76bd00c6891c1bbdeaa9e00 /phpBB | |
| parent | c1407d80472c6df7f3c436d5e1f11382f37f33f3 (diff) | |
| download | forums-c0f6538cf6d9f6f0aca04cd97b9ed94457f72ad4.tar forums-c0f6538cf6d9f6f0aca04cd97b9ed94457f72ad4.tar.gz forums-c0f6538cf6d9f6f0aca04cd97b9ed94457f72ad4.tar.bz2 forums-c0f6538cf6d9f6f0aca04cd97b9ed94457f72ad4.tar.xz forums-c0f6538cf6d9f6f0aca04cd97b9ed94457f72ad4.zip | |
Duplicate log messages for deleting a topic ('LOG_TOPIC_DELETED' has been deprecated in favour of 'LOG_DELETE_TOPIC').
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8942 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 6 |
3 files changed, 7 insertions, 2 deletions
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 @@ <li>[Fix] Correctly handle unread status of subforums (that are not shown on the index) of forums that are shown on the index. (Bug #14589)</li> <li>[Fix] Stop users from deleting posts after the edit time has passed or they have been locked. (Bug #19115)</li> <li>[Fix] Split posts target forum requires 'f_post' now instead of 'm_split'. (Bug #31015)</li> + <li>[Fix] Duplicate log messages for deleting a topic ('LOG_TOPIC_DELETED' has been deprecated in favour of 'LOG_DELETE_TOPIC').</li> <li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li> <li>[Change] Display warning in ACP if config.php file is left writable.</li> 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' => '<strong>Moved split posts</strong><br />» to %s', 'LOG_SPLIT_SOURCE' => '<strong>Split posts</strong><br />» from %s', - 'LOG_TOPIC_DELETED' => '<strong>Deleted topic</strong><br />» %s', 'LOG_TOPIC_APPROVED' => '<strong>Approved topic</strong><br />» %s', 'LOG_TOPIC_DISAPPROVED' => '<strong>Disapproved topic “%1$s” with the following reason</strong><br />%2$s', 'LOG_TOPIC_RESYNC' => '<strong>Resynchronised topic counters</strong><br />» %s', @@ -688,4 +687,9 @@ $lang = array_merge($lang, array( 'LOG_WORD_EDIT' => '<strong>Edited word censor</strong><br />» %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 |