diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-19 17:07:13 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-19 17:07:13 +0000 |
| commit | 0b0da7b33327ecf6a93a8519a4c9ec6c33129d59 (patch) | |
| tree | 134ce93ee77f899c7edd3fe5098ffe1e540ff856 /phpBB | |
| parent | dd75418c4ae6fdeb6ab93b85cf167c44277eb1ae (diff) | |
| download | forums-0b0da7b33327ecf6a93a8519a4c9ec6c33129d59.tar forums-0b0da7b33327ecf6a93a8519a4c9ec6c33129d59.tar.gz forums-0b0da7b33327ecf6a93a8519a4c9ec6c33129d59.tar.bz2 forums-0b0da7b33327ecf6a93a8519a4c9ec6c33129d59.tar.xz forums-0b0da7b33327ecf6a93a8519a4c9ec6c33129d59.zip | |
do not allow categories to be locked by accident (Bug #14548)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8898 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 1e93c6e45d..6095fdd48b 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -154,8 +154,11 @@ class acp_forums if ($forum_data['forum_type'] == FORUM_LINK) { $forum_data['display_on_index'] = request_var('link_display_on_index', false); + } - // Linked forums are not able to be locked... + // Linked forums and categories are not able to be locked... + if ($forum_data['forum_type'] == FORUM_LINK || $forum_data['forum_type'] == FORUM_CAT) + { $forum_data['forum_status'] = ITEM_UNLOCKED; } |