[Phpbb-checkins] r10180 - /branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php

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

Author: acydburn
Date: Wed Sep 23 10:41:54 2009
New Revision: 10180

Log:
check for m_split and m_merge permission on target topic and topic icon selection (Bug #51675)

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

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php Wed Sep 23 10:41:54 2009
***************
*** 259,265 ****
  	// Display topic icons for split topic
  	$s_topic_icons = false;
  
! 	if ($auth->acl_get('m_split', $topic_info['forum_id']))
  	{
  		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
  		$s_topic_icons = posting_gen_topic_icons('', $icon_id);
--- 259,265 ----
  	// Display topic icons for split topic
  	$s_topic_icons = false;
  
! 	if ($auth->acl_gets('m_split', 'm_merge', (int) $topic_info['forum_id']))
  	{
  		include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
  		$s_topic_icons = posting_gen_topic_icons('', $icon_id);