diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-09-23 12:01:26 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-09-23 12:01:26 +0000 |
| commit | 687da94982f5d6f8c3290893d40ed84b02f54a37 (patch) | |
| tree | 4a61a3bee409a1e161f011772499e387ef1bfa08 /phpBB | |
| parent | a1b7a5f8a3886de6408def501869fa492a68fe5d (diff) | |
| download | forums-687da94982f5d6f8c3290893d40ed84b02f54a37.tar forums-687da94982f5d6f8c3290893d40ed84b02f54a37.tar.gz forums-687da94982f5d6f8c3290893d40ed84b02f54a37.tar.bz2 forums-687da94982f5d6f8c3290893d40ed84b02f54a37.tar.xz forums-687da94982f5d6f8c3290893d40ed84b02f54a37.zip | |
Log the forum name that topics are moved into.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8908 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_admin.php | 10 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 5739223392..8b0498f188 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -131,6 +131,7 @@ <li>[Change] Do not count queued posts to user_posts.</li> <li>[Change] Allow setting birth year to current year.</li> <li>[Change] Do not use the topics posted table when performing an egosearch.</li> + <li>[Change] Log the forum name that topics are moved into.</li> <li>[Feature] Allow limited inheritance for template sets.</li> <li>[Feature] Allow hard disabling of the template editor.</li> diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 96deda9f3f..0349cbc6a8 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2398,8 +2398,14 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id if (isset($user->lang[$row['log_operation']])) { - // We supress the warning about inappropriate number of passed parameters here due to possible changes within LOG strings from one version to another. - $log[$i]['action'] = @vsprintf($log[$i]['action'], $log_data_ary); + // Check if there are more occurrences of % than arguments, if there are we fill out the arguments array + // It doesn't matter if we add more arguments than placeholders + if (substr_count($log[$i]['action'], '%') - sizeof($log_data_ary)) + { + $log_data_ary = array_merge($log_data_ary, array_fill(0, substr_count($log[$i]['action'], '%') - sizeof($log_data_ary), '')); + } + + $log[$i]['action'] = vsprintf($log[$i]['action'], $log_data_ary); // If within the admin panel we do not censor text out if (defined('IN_ADMIN')) diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 814add5aa8..1b6a26dc07 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -641,7 +641,7 @@ function mcp_move_topic($topic_ids) { // Get the list of forums to resync, add a log entry $forum_ids[] = $row['forum_id']; - add_log('mod', $to_forum_id, $topic_id, 'LOG_MOVE', $row['forum_name']); + add_log('mod', $to_forum_id, $topic_id, 'LOG_MOVE', $row['forum_name'], $forum_data['forum_name']); // If we have moved a global announcement, we need to correct the topic type if ($row['topic_type'] == POST_GLOBAL) diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 256898c2c1..06b30cf03b 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -479,7 +479,7 @@ $lang = array_merge($lang, array( 'LOG_LOCK' => '<strong>Locked topic</strong><br />» %s', 'LOG_LOCK_POST' => '<strong>Locked post</strong><br />» %s', 'LOG_MERGE' => '<strong>Merged posts</strong> into topic<br />» %s', - 'LOG_MOVE' => '<strong>Moved topic</strong><br />» from %s', + 'LOG_MOVE' => '<strong>Moved topic</strong><br />» from %1$s to %2$s', 'LOG_POST_APPROVED' => '<strong>Approved post</strong><br />» %s', 'LOG_POST_DISAPPROVED' => '<strong>Disapproved post “%1$s” with the following reason</strong><br />» %2$s', 'LOG_POST_EDITED' => '<strong>Edited post “%1$s” written by</strong><br />» %2$s', |