aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-05-20 10:07:05 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-05-20 10:07:05 +0000
commitd5477a53dac3a655907b45986b25c962335b086c (patch)
tree033ef149422739ba0779f2ec12b7dacde9465984 /phpBB/includes/acp
parent15a4889f49a6ed2c63bb2ea8e902258ea860a923 (diff)
downloadforums-d5477a53dac3a655907b45986b25c962335b086c.tar
forums-d5477a53dac3a655907b45986b25c962335b086c.tar.gz
forums-d5477a53dac3a655907b45986b25c962335b086c.tar.bz2
forums-d5477a53dac3a655907b45986b25c962335b086c.tar.xz
forums-d5477a53dac3a655907b45986b25c962335b086c.zip
language change and reset locked status for link forum type.
git-svn-id: file:///svn/phpbb/trunk@7652 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_forums.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index cf25945df7..0f38d6663b 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -137,6 +137,9 @@ 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...
+ $forum_data['forum_status'] = ITEM_UNLOCKED;
}
$forum_data['show_active'] = ($forum_data['forum_type'] == FORUM_POST) ? request_var('display_recent', false) : request_var('display_active', false);