[Phpbb-checkins] r9989 - /branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php

[Joas S. <nic...@ph...>]

Author: nickvergessen
Date: Sat Aug 15 11:45:32 2009
New Revision: 9989

Log:
Fix Bug #49725 introduced in r9814

Authorised by: ToonArmy

Modified:
    branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_front.php Sat Aug 15 11:45:32 2009
***************
*** 34,40 ****
  		$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
--- 34,40 ----
  		$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,254 ****
--- 249,255 ----
  	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,268 ****
  		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',
--- 263,268 ----
***************
*** 300,306 ****
  
  				$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"),
! 					
  					'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']),
--- 300,306 ----
  
  				$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"),
! 
  					'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']),