mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge PR #721 branch 'rahulr92/ticket/10650' into develop

Browse Source 
* 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
This commit is contained in:
Oleg Pudeyev
2012-05-21 23:42:48 -04:00
parent 3c5eca4aed e2d286d9f1
commit 3b6ca178aa
6 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/includes/acp/acp_board.php
View File

@@ -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',