[Phpbb-checkins] r10252 - in /branches/phpBB-3_0_0/phpBB/includes/mcp: mcp_queue.php mcp_reports.php

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Tue Nov  3 14:51:07 2009
New Revision: 10252

Log:
Fix Bug #53545 - javascript error in template

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

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_queue.php Tue Nov  3 14:51:07 2009
***************
*** 105,110 ****
--- 105,111 ----
  				{
  					$template->assign_vars(array(
  						'S_TOPIC_REVIEW'	=> true,
+ 						'S_BBCODE_ALLOWED'	=> $post_info['enable_bbcode'],
  						'TOPIC_TITLE'		=> $post_info['topic_title'])
  					);
  				}

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_reports.php Tue Nov  3 14:51:07 2009
***************
*** 116,121 ****
--- 116,122 ----
  				{
  					$template->assign_vars(array(
  						'S_TOPIC_REVIEW'	=> true,
+ 						'S_BBCODE_ALLOWED'	=> $post_info['enable_bbcode'],
  						'TOPIC_TITLE'		=> $post_info['topic_title'])
  					);
  				}
***************
*** 429,435 ****
  					'PAGE_NUMBER'			=> on_page($total, $config['topics_per_page'], $start),
  					'TOPIC_ID'				=> $topic_id,
  					'TOTAL'					=> $total,
! 					'TOTAL_REPORTS'			=> ($total == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $total),					
  					)
  				);
  
--- 430,436 ----
  					'PAGE_NUMBER'			=> on_page($total, $config['topics_per_page'], $start),
  					'TOPIC_ID'				=> $topic_id,
  					'TOTAL'					=> $total,
! 					'TOTAL_REPORTS'			=> ($total == 1) ? $user->lang['LIST_REPORT'] : sprintf($user->lang['LIST_REPORTS'], $total),
  					)
  				);
  
***************
*** 671,677 ****
  				$messenger->send($reporter['user_notify_type']);
  			}
  		}
! 		
  		if (!$pm)
  		{
  			foreach ($post_info as $post)
--- 672,678 ----
  				$messenger->send($reporter['user_notify_type']);
  			}
  		}
! 
  		if (!$pm)
  		{
  			foreach ($post_info as $post)
***************
*** 712,724 ****
  			{
  				$return_forum = sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />';
  			}
! 			
  			if (sizeof($topic_ids) === 1)
  			{
  				$return_topic = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . current($topic_ids) . '&amp;f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />';
  			}
  		}
! 		
  		trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_forum . $return_topic . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>'));
  	}
  }
--- 713,725 ----
  			{
  				$return_forum = sprintf($user->lang['RETURN_FORUM'], '<a href="' . append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />';
  			}
! 
  			if (sizeof($topic_ids) === 1)
  			{
  				$return_topic = sprintf($user->lang['RETURN_TOPIC'], '<a href="' . append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . current($topic_ids) . '&amp;f=' . current($forum_ids)) . '">', '</a>') . '<br /><br />';
  			}
  		}
! 
  		trigger_error($user->lang[$success_msg] . '<br /><br />' . $return_forum . $return_topic . sprintf($user->lang['RETURN_PAGE'], "<a href=\"$redirect\">", '</a>'));
  	}
  }