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

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

Author: acydburn
Date: Thu Aug 20 12:40:36 2009
New Revision: 10024

Log:
fix sql error due to us using STRICT db mode. ;)

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 Thu Aug 20 12:40:36 2009
***************
*** 125,130 ****
--- 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),
***************
*** 443,448 ****
--- 444,450 ----
  							'prune_viewed'			=> 7,
  							'prune_freq'			=> 1,
  							'forum_flags'			=> FORUM_FLAG_POST_REVIEW,
+ 							'forum_options'			=> 0,
  							'forum_password'		=> '',
  							'forum_password_confirm'=> '',
  						);
***************
*** 699,706 ****
  
  				return;
  			break;
! 			
! 			case 'copy_perm': 
  				$forum_perm_from = request_var('forum_perm_from', 0);
  
  				// Copy permissions?
--- 701,708 ----
  
  				return;
  			break;
! 
! 			case 'copy_perm':
  				$forum_perm_from = request_var('forum_perm_from', 0);
  
  				// Copy permissions?
***************
*** 1921,1927 ****
  	function copy_permission_page($forum_data)
  	{
  		global $phpEx, $phpbb_admin_path, $template, $user;
! 	
  		$acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id'];
  		$action = append_sid($this->u_action . "&parent_id={$this->parent_id}&f={$forum_data['forum_id']}&action=copy_perm");
  
--- 1923,1929 ----
  	function copy_permission_page($forum_data)
  	{
  		global $phpEx, $phpbb_admin_path, $template, $user;
! 
  		$acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id'];
  		$action = append_sid($this->u_action . "&parent_id={$this->parent_id}&f={$forum_data['forum_id']}&action=copy_perm");