[Phpbb-checkins] r10196 - /branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_main.php

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

Author: acydburn
Date: Tue Sep 29 15:51:58 2009
New Revision: 10196

Log:
Fix Bug #52125, regression from r9678 for Bug #46225

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

Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_main.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_main.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_main.php Tue Sep 29 15:51:58 2009
***************
*** 813,819 ****
  
  		foreach ($data as $topic_id => $row)
  		{
! 			add_log('mod', $row['forum_id'], $topic_id, 'LOG_DELETE_' . ($row['topic_moved_id'] ? 'SHADOW_' : '') . 'TOPIC', $row['topic_title']);
  		}
  
  		$return = delete_topics('topic_id', $topic_ids);
--- 813,826 ----
  
  		foreach ($data as $topic_id => $row)
  		{
! 			if ($row['topic_moved_id'])
! 			{
! 				add_log('mod', $row['forum_id'], $topic_id, 'LOG_DELETE_SHADOW_TOPIC', $row['topic_title']);
! 			}
! 			else
! 			{
! 				add_log('mod', $row['forum_id'], $topic_id, 'LOG_DELETE_TOPIC', $row['topic_title'], $row['topic_first_poster_name']);
! 			}
  		}
  
  		$return = delete_topics('topic_id', $topic_ids);
***************
*** 897,903 ****
  
  		foreach ($post_data as $id => $row)
  		{
! 			add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_DELETE_POST', $row['post_subject']);
  		}
  
  		// Now delete the posts, topics and forums are automatically resync'ed
--- 904,911 ----
  
  		foreach ($post_data as $id => $row)
  		{
! 			$post_username = ($row['poster_id'] == ANONYMOUS && !empty($row['post_username'])) ? $row['post_username'] : $row['username'];
! 			add_log('mod', $row['forum_id'], $row['topic_id'], 'LOG_DELETE_POST', $row['post_subject'], $post_username);
  		}
  
  		// Now delete the posts, topics and forums are automatically resync'ed