[Phpbb-checkins] r9979 - /branches/phpBB-3_0_0/phpBB/includes/functions_admin.php

[Andreas F. <ba...@ph...>]

Author: bantu
Date: Fri Aug 14 12:15:44 2009
New Revision: 9979

Log:
Some things I missed in r9887.

Modified:
    branches/phpBB-3_0_0/phpBB/includes/functions_admin.php

Modified: branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_admin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_admin.php Fri Aug 14 12:15:44 2009
***************
*** 338,349 ****
  		return false;
  	}
  
! 	// Check if source forums exists
  	$sql = 'SELECT forum_name
  		FROM ' . FORUMS_TABLE . '
  		WHERE forum_id = ' . $src_forum_id;
  	$result = $db->sql_query($sql);
  	$src_forum_name = $db->sql_fetchfield('forum_name');
  
  	// Source forum doesn't exist
  	if (empty($src_forum_name))
--- 338,350 ----
  		return false;
  	}
  
! 	// Check if source forum exists
  	$sql = 'SELECT forum_name
  		FROM ' . FORUMS_TABLE . '
  		WHERE forum_id = ' . $src_forum_id;
  	$result = $db->sql_query($sql);
  	$src_forum_name = $db->sql_fetchfield('forum_name');
+ 	$db->sql_freeresult($result);
  
  	// Source forum doesn't exist
  	if (empty($src_forum_name))
***************
*** 357,362 ****
--- 358,364 ----
  		WHERE ' . $db->sql_in_set('forum_id', $dest_forum_ids);
  	$result = $db->sql_query($sql);
  
+ 	$dest_forum_ids = $dest_forum_names = array();
  	while ($row = $db->sql_fetchrow($result))
  	{
  		$dest_forum_ids[]	= (int) $row['forum_id'];