mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-09 19:26:53 +02:00
Code Issues Releases Wiki Activity

Fix Bug #49725 introduced in r9814

Browse Source 
Authorised by: ToonArmy


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9989 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Joas Schilling
2009-08-15 10:45:32 +00:00
parent 36e18c7bd3
commit 079244a39d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/mcp/mcp_front.php
View File

@ -34,7 +34,7 @@ function mcp_front_view($id, $mode, $action)
$forum_id = request_var('f', 0); $forum_id = request_var('f', 0);
$template->assign_var('S_SHOW_UNAPPROVED', (!empty($forum_list)) ? true : false); $template->assign_var('S_SHOW_UNAPPROVED', (!empty($forum_list)) ? true : false);
if (!empty($forum_list)) if (!empty($forum_list))
{ {
$sql = 'SELECT COUNT(post_id) AS total $sql = 'SELECT COUNT(post_id) AS total
@ -249,6 +249,7 @@ function mcp_front_view($id, $mode, $action)
if ($module->loaded('pm_reports') && $auth->acl_getf_global('m_report')) if ($module->loaded('pm_reports') && $auth->acl_getf_global('m_report'))
{ {
$template->assign_var('S_SHOW_PM_REPORTS', true); $template->assign_var('S_SHOW_PM_REPORTS', true);
$user->add_lang(array('ucp'));
$sql = 'SELECT COUNT(r.report_id) AS total $sql = 'SELECT COUNT(r.report_id) AS total
FROM ' . REPORTS_TABLE . ' r, ' . PRIVMSGS_TABLE . ' p FROM ' . REPORTS_TABLE . ' r, ' . PRIVMSGS_TABLE . ' p
@ -262,7 +263,6 @@ function mcp_front_view($id, $mode, $action)
if ($total) if ($total)
{ {
include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx); include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx);
$user->add_lang(array('ucp'));
$sql = $db->sql_build_query('SELECT', array( $sql = $db->sql_build_query('SELECT', array(
'SELECT' => 'r.report_id, r.report_time, p.msg_id, p.message_subject, p.message_time, p.to_address, p.bcc_address, u.username, u.username_clean, u.user_colour, u.user_id, u2.username as author_name, u2.username_clean as author_name_clean, u2.user_colour as author_colour, u2.user_id as author_id', 'SELECT' => 'r.report_id, r.report_time, p.msg_id, p.message_subject, p.message_time, p.to_address, p.bcc_address, u.username, u.username_clean, u.user_colour, u.user_id, u2.username as author_name, u2.username_clean as author_name_clean, u2.user_colour as author_colour, u2.user_id as author_id',
@ -300,7 +300,7 @@ function mcp_front_view($id, $mode, $action)
$template->assign_block_vars('pm_report', array( $template->assign_block_vars('pm_report', array(
'U_PM_DETAILS' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'r=' . $row['report_id'] . "&i=pm_reports&mode=pm_report_details"), 'U_PM_DETAILS' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'r=' . $row['report_id'] . "&i=pm_reports&mode=pm_report_details"),
'REPORTER_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), 'REPORTER_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']),
'REPORTER' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']), 'REPORTER' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
'REPORTER_COLOUR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']), 'REPORTER_COLOUR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),