diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-09-26 18:29:20 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-09-26 18:29:20 +0000 |
| commit | 7e0ae65c680738b5c754cd78a5189ba1f1162026 (patch) | |
| tree | c2903dae10d795e5e6c4e6fb5c7ce79484ec7723 /phpBB | |
| parent | 3b42ffcc9e44e8b6e8c5c7233de9273e8cb374f6 (diff) | |
| download | forums-7e0ae65c680738b5c754cd78a5189ba1f1162026.tar forums-7e0ae65c680738b5c754cd78a5189ba1f1162026.tar.gz forums-7e0ae65c680738b5c754cd78a5189ba1f1162026.tar.bz2 forums-7e0ae65c680738b5c754cd78a5189ba1f1162026.tar.xz forums-7e0ae65c680738b5c754cd78a5189ba1f1162026.zip | |
* Use a distinct log message for shadow topic deletions to differentiate between normal topic deletions. #34635
* Fix a small typo in r8942
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8945 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 | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 17a6367de8..dbd6098a50 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -124,6 +124,7 @@ <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>[Fix] Use a distinct log message for shadow topic deletions to differentiate between normal topic deletions. (Bug #34635)</li> <li>[Fix] Fix problems with styles using an underscore within the filename. (Bug #34315)</li> <li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li> diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 07ec84f0de..7d871800f2 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'], $topic_id, 'LOG_DELETED_TOPIC', $row['topic_title']); + add_log('mod', $row['forum_id'], $topic_id, 'LOG_DELETE_' . ($row['topic_moved_id'] ? 'SHADOW_' : '') . '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 cb3442e9a9..a9708308ac 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -474,6 +474,7 @@ $lang = array_merge($lang, array( 'LOG_APPROVE_TOPIC' => '<strong>Approved topic</strong><br />» %s', 'LOG_BUMP_TOPIC' => '<strong>User bumped topic</strong><br />» %s', 'LOG_DELETE_POST' => '<strong>Deleted post</strong><br />» %s', + 'LOG_DELETE_SHADOW_TOPIC' => '<strong>Deleted shadow topic</strong><br />» %s', 'LOG_DELETE_TOPIC' => '<strong>Deleted topic</strong><br />» %s', 'LOG_FORK' => '<strong>Copied topic</strong><br />» from %s', 'LOG_LOCK' => '<strong>Locked topic</strong><br />» %s', |