aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_forums.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-10-25 09:03:05 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-10-25 09:03:05 +0000
commit6d1c40f6e6ca2f2737df4dd073c988be00b6b3fc (patch)
treeb74418d17932c622ac3a11264f7be7a1d3cb156a /phpBB/includes/acp/acp_forums.php
parentd7d810a5862475629e384ab7e6f80687ee7d7f32 (diff)
downloadforums-6d1c40f6e6ca2f2737df4dd073c988be00b6b3fc.tar
forums-6d1c40f6e6ca2f2737df4dd073c988be00b6b3fc.tar.gz
forums-6d1c40f6e6ca2f2737df4dd073c988be00b6b3fc.tar.bz2
forums-6d1c40f6e6ca2f2737df4dd073c988be00b6b3fc.tar.xz
forums-6d1c40f6e6ca2f2737df4dd073c988be00b6b3fc.zip
Fix Bug #53175 (forum_options cleared if editing forum) - regression from r10024
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10233 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_forums.php')
-rw-r--r--phpBB/includes/acp/acp_forums.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 2ff597ee98..cc56aba369 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -125,7 +125,6 @@ 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),
@@ -159,6 +158,12 @@ class acp_forums
'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)
{