diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-06-26 10:15:42 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-06-26 10:15:42 +0000 |
| commit | d92bdc8a76c8e1ab2f3398c84fc74750f71b4ea4 (patch) | |
| tree | 647b24f511047bf3548de9a7e1659da4a5a875a3 | |
| parent | d39d8481cfd6a9cd1e418aaff14833a149770e71 (diff) | |
| download | forums-d92bdc8a76c8e1ab2f3398c84fc74750f71b4ea4.tar forums-d92bdc8a76c8e1ab2f3398c84fc74750f71b4ea4.tar.gz forums-d92bdc8a76c8e1ab2f3398c84fc74750f71b4ea4.tar.bz2 forums-d92bdc8a76c8e1ab2f3398c84fc74750f71b4ea4.tar.xz forums-d92bdc8a76c8e1ab2f3398c84fc74750f71b4ea4.zip | |
Fix bug #46225 - Add poster-name to moderator-log when deleting post/topic
Authorised by: acydburn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9678 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 4 | ||||
| -rw-r--r-- | phpBB/posting.php | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 0d09c5dc00..10085f69da 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -134,6 +134,7 @@ <li>[Fix] Correctly display ACP logs options, without permission to clear logs. (Bug #24155 - Patch by leviatan21)</li> <li>[Fix] Display topic icons in MCP forum view again (only prosilver).</li> <li>[Fix] Properly display post status messages in topic when post is reported and unapproved (Bug #44455 - Patch by leviatan21)</li> + <li>[Fix] Add poster-name to moderator-log when deleting post/topic (Bug #46225 - Patch by nickvergessen)</li> <li>[Fix] "Report details" link broken in MCP (Bug #46975 - Patch by nickvergessen)</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li> diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 65475d7627..7e92594b85 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -479,9 +479,9 @@ $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_POST' => '<strong>Deleted post “%1$s” written by</strong><br />» %2$s', 'LOG_DELETE_SHADOW_TOPIC' => '<strong>Deleted shadow topic</strong><br />» %s', - 'LOG_DELETE_TOPIC' => '<strong>Deleted topic</strong><br />» %s', + 'LOG_DELETE_TOPIC' => '<strong>Deleted topic “%1$s” written by</strong><br />» %2$s', 'LOG_FORK' => '<strong>Copied topic</strong><br />» from %s', 'LOG_LOCK' => '<strong>Locked topic</strong><br />» %s', 'LOG_LOCK_POST' => '<strong>Locked post</strong><br />» %s', diff --git a/phpBB/posting.php b/phpBB/posting.php index 66daf7128f..4f099d97ac 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1440,14 +1440,14 @@ function handle_post_delete($forum_id, $topic_id, $post_id, &$post_data) if ($next_post_id === false) { - add_log('mod', $forum_id, $topic_id, 'LOG_DELETE_TOPIC', $post_data['topic_title']); + add_log('mod', $forum_id, $topic_id, 'LOG_DELETE_TOPIC', $post_data['topic_title'], $post_data['username']); $meta_info = append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id"); $message = $user->lang['POST_DELETED']; } else { - add_log('mod', $forum_id, $topic_id, 'LOG_DELETE_POST', $post_data['post_subject']); + add_log('mod', $forum_id, $topic_id, 'LOG_DELETE_POST', $post_data['post_subject'], $post_data['username']); $meta_info = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&p=$next_post_id") . "#p$next_post_id"; $message = $user->lang['POST_DELETED'] . '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $meta_info . '">', '</a>'); |