[Phpbb-checkins] r10233 - /branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php

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

Author: acydburn
Date: Sun Oct 25 09:03:05 2009
New Revision: 10233

Log:
Fix Bug #53175 (forum_options cleared if editing forum) - regression from r10024

Modified:
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php Sun Oct 25 09:03:05 2009
***************
*** 125,131 ****
  						'type_action'			=> request_var('type_action', ''),
  						'forum_status'			=> request_var('forum_status', ITEM_UNLOCKED),
  						'forum_parents'			=> '',
- 						'forum_options'			=> 0,
  						'forum_name'			=> utf8_normalize_nfc(request_var('forum_name', '', true)),
  						'forum_link'			=> request_var('forum_link', ''),
  						'forum_link_track'		=> request_var('forum_link_track', false),
--- 125,130 ----
***************
*** 159,164 ****
--- 158,169 ----
  						'forum_password_unset'	=> request_var('forum_password_unset', false),
  					);
  
+ 					// On add, add empty forum_options... else do not consider it (not updating it)
+ 					if ($action == 'add')
+ 					{
+ 						$forum_data['forum_options'] = 0;
+ 					}
+ 
  					// Use link_display_on_index setting if forum type is link
  					if ($forum_data['forum_type'] == FORUM_LINK)
  					{