From d5477a53dac3a655907b45986b25c962335b086c Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 20 May 2007 10:07:05 +0000 Subject: [PATCH] language change and reset locked status for link forum type. git-svn-id: file:///svn/phpbb/trunk@7652 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_forums.php | 3 +++ phpBB/language/en/acp/profile.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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); diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php index b40ea4b171..bd4a3f0e6e 100644 --- a/phpBB/language/en/acp/profile.php +++ b/phpBB/language/en/acp/profile.php @@ -125,7 +125,7 @@ $lang = array_merge($lang, array( 'SAVE' => 'Save', 'SECOND_OPTION' => 'Second option', - 'STEP_1_EXPLAIN_CREATE' => 'Here you can enter the first basic parameters of your new profile field. These information are needed for the second step where you are able to set remaining options and tweak your profile field further.', + 'STEP_1_EXPLAIN_CREATE' => 'Here you can enter the first basic parameters of your new profile field. This information is needed for the second step where you’ll be able to set remaining options and tweak your profile field further.', 'STEP_1_EXPLAIN_EDIT' => 'Here you can change the basic parameters of your profile field. The relevant options are re-calculated within the second step.', 'STEP_1_TITLE_CREATE' => 'Add profile field', 'STEP_1_TITLE_EDIT' => 'Edit profile field',