diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-19 17:07:45 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-19 17:07:45 +0000 |
| commit | 6f0ea3c9d241b90e83ba669befcc38cf94bd6849 (patch) | |
| tree | 1e3da101e8a5bc947ca0526b2c02d1a5743e5f8c /phpBB | |
| parent | 8fd7f1664265276917550f3092d2347d3388ce55 (diff) | |
| download | forums-6f0ea3c9d241b90e83ba669befcc38cf94bd6849.tar forums-6f0ea3c9d241b90e83ba669befcc38cf94bd6849.tar.gz forums-6f0ea3c9d241b90e83ba669befcc38cf94bd6849.tar.bz2 forums-6f0ea3c9d241b90e83ba669befcc38cf94bd6849.tar.xz forums-6f0ea3c9d241b90e83ba669befcc38cf94bd6849.zip | |
do not allow categories to be locked by accident (Bug #14548)
git-svn-id: file:///svn/phpbb/trunk@8899 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 69c44f9edc..da32a66fa7 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -153,8 +153,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; } |