aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2009-08-15 10:45:32 +0000
committerJoas Schilling <nickvergessen@gmx.de>2009-08-15 10:45:32 +0000
commit079244a39ded84c78b9ca2f2a1fcd0dc178beea7 (patch)
tree63936d7c7afd83960471c4cad7cc6a1e3c1c30df /phpBB
parent36e18c7bd3a147fff3f1a44bb74fe5404aeab197 (diff)
downloadforums-079244a39ded84c78b9ca2f2a1fcd0dc178beea7.tar
forums-079244a39ded84c78b9ca2f2a1fcd0dc178beea7.tar.gz
forums-079244a39ded84c78b9ca2f2a1fcd0dc178beea7.tar.bz2
forums-079244a39ded84c78b9ca2f2a1fcd0dc178beea7.tar.xz
forums-079244a39ded84c78b9ca2f2a1fcd0dc178beea7.zip
Fix Bug #49725 introduced in r9814
Authorised by: ToonArmy git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9989 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/mcp/mcp_front.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php
index 3f73bde7d8..23dbb12a50 100644
--- a/phpBB/includes/mcp/mcp_front.php
+++ b/phpBB/includes/mcp/mcp_front.php
@@ -34,7 +34,7 @@ function mcp_front_view($id, $mode, $action)
$forum_id = request_var('f', 0);
$template->assign_var('S_SHOW_UNAPPROVED', (!empty($forum_list)) ? true : false);
-
+
if (!empty($forum_list))
{
$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'))
{
$template->assign_var('S_SHOW_PM_REPORTS', true);
+ $user->add_lang(array('ucp'));
$sql = 'SELECT COUNT(r.report_id) AS total
FROM ' . REPORTS_TABLE . ' r, ' . PRIVMSGS_TABLE . ' p
@@ -262,7 +263,6 @@ function mcp_front_view($id, $mode, $action)
if ($total)
{
include($phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx);
- $user->add_lang(array('ucp'));
$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',
@@ -300,7 +300,7 @@ function mcp_front_view($id, $mode, $action)
$template->assign_block_vars('pm_report', array(
'U_PM_DETAILS' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'r=' . $row['report_id'] . "&amp;i=pm_reports&amp;mode=pm_report_details"),
-
+
'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_COLOUR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),