[Phpbb-checkins] CVS: phpBB2/admin admin_forums.php,1.29,1.30

[James A. <th...@us...>]

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv18218/admin

Modified Files:
	admin_forums.php 
Log Message:
Fixed bug with deleting categories, and found a hard coded english message!


Index: admin_forums.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_forums.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** admin_forums.php	2001/11/27 20:57:58	1.29
--- admin_forums.php	2001/11/29 08:45:54	1.30
***************
*** 672,676 ****
  				if ($count > 0)
  				{
! 					message_die(GENERAL_ERROR, "You need to delete all forums before you can delete this category");
  				}
  				else
--- 672,676 ----
  				if ($count > 0)
  				{
! 					message_die(GENERAL_ERROR, $lang['Must_delete_forums']);
  				}
  				else
***************
*** 699,703 ****
  				'L_MOVE_CONTENTS' => $lang['Move_contents'], 
  				'L_FORUM_NAME' => $lang['Forum_name'], 
! 
  				'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"), 
  				'S_SELECT_TO' => $select_to,
--- 699,704 ----
  				'L_MOVE_CONTENTS' => $lang['Move_contents'], 
  				'L_FORUM_NAME' => $lang['Forum_name'], 
! 				
! 				'S_HIDDEN_FIELDS' => $s_hidden_fields,
  				'S_FORUM_ACTION' => append_sid("admin_forums.$phpEx"), 
  				'S_SELECT_TO' => $select_to,
***************
*** 740,743 ****
--- 741,746 ----
  			$sql = "DELETE FROM " . CATEGORIES_TABLE ."
  				WHERE cat_id = $from_id";
+ 				
+ 			echo $sql;
  			if( !$result = $db->sql_query($sql) )
  			{