aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-08-20 11:40:36 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-08-20 11:40:36 +0000
commit4fb22c972ff64559bc064c3017fbc1c6fd29e523 (patch)
tree1fb79ead2467412876b7ef767053a138dad02676
parentb6ba5a89b11428ca6ac7644a2214fe964da5ea27 (diff)
downloadforums-4fb22c972ff64559bc064c3017fbc1c6fd29e523.tar
forums-4fb22c972ff64559bc064c3017fbc1c6fd29e523.tar.gz
forums-4fb22c972ff64559bc064c3017fbc1c6fd29e523.tar.bz2
forums-4fb22c972ff64559bc064c3017fbc1c6fd29e523.tar.xz
forums-4fb22c972ff64559bc064c3017fbc1c6fd29e523.zip
fix sql error due to us using STRICT db mode. ;)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10024 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/acp/acp_forums.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 5f56bfb84d..5a44af836f 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -125,6 +125,7 @@ class acp_forums
'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,6 +444,7 @@ class acp_forums
'prune_viewed' => 7,
'prune_freq' => 1,
'forum_flags' => FORUM_FLAG_POST_REVIEW,
+ 'forum_options' => 0,
'forum_password' => '',
'forum_password_confirm'=> '',
);
@@ -699,8 +701,8 @@ class acp_forums
return;
break;
-
- case 'copy_perm':
+
+ case 'copy_perm':
$forum_perm_from = request_var('forum_perm_from', 0);
// Copy permissions?
@@ -1921,7 +1923,7 @@ class acp_forums
function copy_permission_page($forum_data)
{
global $phpEx, $phpbb_admin_path, $template, $user;
-
+
$acl_url = '&amp;mode=setting_forum_local&amp;forum_id[]=' . $forum_data['forum_id'];
$action = append_sid($this->u_action . "&amp;parent_id={$this->parent_id}&amp;f={$forum_data['forum_id']}&amp;action=copy_perm");