diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-07-18 20:34:26 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-07-18 20:34:26 +0000 |
| commit | 1984ab5af5f71fe99508efeb4467ebddd3ffbfab (patch) | |
| tree | 0a8e6dc8c1f78c88582eacf8f20205315201bd90 /phpBB/includes | |
| parent | ec3bcb4a829603081bb7f1b625bf002740ff48ba (diff) | |
| download | forums-1984ab5af5f71fe99508efeb4467ebddd3ffbfab.tar forums-1984ab5af5f71fe99508efeb4467ebddd3ffbfab.tar.gz forums-1984ab5af5f71fe99508efeb4467ebddd3ffbfab.tar.bz2 forums-1984ab5af5f71fe99508efeb4467ebddd3ffbfab.tar.xz forums-1984ab5af5f71fe99508efeb4467ebddd3ffbfab.zip | |
Efficiency improvement to the log viewing code
+ reverting what appears to be an accidental change to the report viewing code
git-svn-id: file:///svn/phpbb/trunk@6192 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 3 | ||||
| -rwxr-xr-x | phpBB/includes/mcp/mcp_reports.php | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 77254c0569..725bd52940 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2140,8 +2140,7 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id if (isset($user->lang[$row['log_operation']])) { - $params = array_merge(array($log[$i]['action']), $log_data_ary); - $log[$i]['action'] = call_user_func_array('sprintf', $params); + $log[$i]['action'] = vsprintf($log[$i]['action'], $log_data_ary); $log[$i]['action'] = str_replace("\n", '<br />', censor_text($log[$i]['action'])); } else diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 9bafa6ffeb..16fa71e9c8 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -313,7 +313,7 @@ class mcp_reports 'U_VIEW_POSTER_PROFILE' => ($row['poster_id'] != ANONYMOUS) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['poster_id']) : '', 'U_VIEW_REPORTER_PROFILE' => ($row['reporter_id'] != ANONYMOUS) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u=' . $row['reporter_id']) : '', - 'FORUM_NAME' => (!$global_topic) ? $forum_names[$row['forum_id']] : $user->lang['GLOBAL_ANNOUNCEMENT'], + 'FORUM_NAME' => (!$global_topic) ? $forum_data[$row['forum_id']]['forum_name'] : $user->lang['GLOBAL_ANNOUNCEMENT'], 'POSTER' => $poster, 'POST_ID' => $row['post_id'], 'POST_SUBJECT' => $row['post_subject'], |