diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-05-21 23:42:48 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-05-21 23:42:48 -0400 |
| commit | 3b6ca178aa622fb1cc64c977fdc9eb47e3843cc7 (patch) | |
| tree | 2bf15639450d275ce8f318dbd11b314355989f84 /phpBB/includes/acp/acp_board.php | |
| parent | 3c5eca4aed405afd425b165f7b6fd21fb3fe1095 (diff) | |
| parent | e2d286d9f133ffb5128262fc88bfd86766f7b50f (diff) | |
| download | forums-3b6ca178aa622fb1cc64c977fdc9eb47e3843cc7.tar forums-3b6ca178aa622fb1cc64c977fdc9eb47e3843cc7.tar.gz forums-3b6ca178aa622fb1cc64c977fdc9eb47e3843cc7.tar.bz2 forums-3b6ca178aa622fb1cc64c977fdc9eb47e3843cc7.tar.xz forums-3b6ca178aa622fb1cc64c977fdc9eb47e3843cc7.zip | |
Merge PR #721 branch 'rahulr92/ticket/10650' into develop
* rahulr92/ticket/10650:
[ticket/10650] Subject is cleared if no permissions exist
[ticket/10650] Changed apostrophe to utf8 single quote
[ticket/10650] Moving censoring to before truncation
[ticket/10650] Added apostrophe in explanation in language file
[ticket/10650] Inserted correct utf ELLIPSIS character
[ticket/10650] Added space after if and comment
[ticket/10650] Added ellipsis to language file
[ticket/10650] Added href title to subject link
[ticket/10650] Made use of truncate_string() function
[ticket/10650] Removed changes from acp_forums.php
[ticket/10650]Removed incorrect newline
[ticket/10650] Changed acp option from per forum to global
[ticket/10650] Added checking for empty subjects
[ticket/10650] Corrected intendation
[ticket/10650]Added permission checking and utf8 functions
[ticket/10650] Cropped subject and inserted newline
[ticket/10650] Corrected space before true
[ticket/10650] Changed language files and forumlist
[ticket/10650] Added static sql files
[ticket/10650] Displaying last topic on forum list
Conflicts:
phpBB/install/database_update.php
phpBB/language/en/common.php
Diffstat (limited to 'phpBB/includes/acp/acp_board.php')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 951166f086..d537885ef1 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -88,6 +88,7 @@ class acp_board 'allow_nocensors' => array('lang' => 'ALLOW_NO_CENSORS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'allow_bookmarks' => array('lang' => 'ALLOW_BOOKMARKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'allow_birthdays' => array('lang' => 'ALLOW_BIRTHDAYS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), + 'display_last_subject' => array('lang' => 'DISPLAY_LAST_SUBJECT', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'allow_quick_reply' => array('lang' => 'ALLOW_QUICK_REPLY', 'validate' => 'bool', 'type' => 'custom', 'method' => 'quick_reply', 'explain' => true), 'legend2' => 'ACP_LOAD_SETTINGS', |