mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
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
This commit is contained in:
parent
d7d810a586
commit
6d1c40f6e6
1 changed files with 6 additions and 1 deletions
|
@ -125,7 +125,6 @@ class acp_forums
|
||||||
'type_action' => request_var('type_action', ''),
|
'type_action' => request_var('type_action', ''),
|
||||||
'forum_status' => request_var('forum_status', ITEM_UNLOCKED),
|
'forum_status' => request_var('forum_status', ITEM_UNLOCKED),
|
||||||
'forum_parents' => '',
|
'forum_parents' => '',
|
||||||
'forum_options' => 0,
|
|
||||||
'forum_name' => utf8_normalize_nfc(request_var('forum_name', '', true)),
|
'forum_name' => utf8_normalize_nfc(request_var('forum_name', '', true)),
|
||||||
'forum_link' => request_var('forum_link', ''),
|
'forum_link' => request_var('forum_link', ''),
|
||||||
'forum_link_track' => request_var('forum_link_track', false),
|
'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),
|
'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
|
// Use link_display_on_index setting if forum type is link
|
||||||
if ($forum_data['forum_type'] == FORUM_LINK)
|
if ($forum_data['forum_type'] == FORUM_LINK)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Reference in a new issue