aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-04-04 18:28:36 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2012-04-04 19:23:05 -0400
commit98964a913cb22761553d04170aa4830e324f7488 (patch)
tree5a7a841cdacae65ea59ab965dd9d718e9e62085e /phpBB/language
parentb1fb34a4d7e446768b9f66ba6dd359173cd2a5fb (diff)
downloadforums-98964a913cb22761553d04170aa4830e324f7488.tar
forums-98964a913cb22761553d04170aa4830e324f7488.tar.gz
forums-98964a913cb22761553d04170aa4830e324f7488.tar.bz2
forums-98964a913cb22761553d04170aa4830e324f7488.tar.xz
forums-98964a913cb22761553d04170aa4830e324f7488.zip
[ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
The pull request (#654) was merged a little too quickly. In particular, display_last_subject per-forum option needs consensus. This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59. PHPBB3-10650
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/forums.php2
1 files changed, 0 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php
index 9141abc8eb..756cb7ae0f 100644
--- a/phpBB/language/en/acp/forums.php
+++ b/phpBB/language/en/acp/forums.php
@@ -57,8 +57,6 @@ $lang = array_merge($lang, array(
'DELETE_ALL_POSTS' => 'Delete posts',
'DELETE_SUBFORUMS' => 'Delete subforums and posts',
'DISPLAY_ACTIVE_TOPICS' => 'Enable active topics',
- 'DISPLAY_LAST_SUBJECT' => 'Display subject of last added post on forum list',
- 'DISPLAY_LAST_SUBJECT_EXPLAIN' => 'If set to yes the subject of the last added post will be displayed in the forum list with a hyperlink to the post.',
'DISPLAY_ACTIVE_TOPICS_EXPLAIN' => 'If set to yes active topics in selected subforums will be displayed under this category.',
'EDIT_FORUM' => 'Edit forum',