mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-09 00:55:23 +02:00
Code Issues Releases Wiki Activity

Do not display the "You have reached your blah blah folder limit" when the administrator has set the limit to 0. Existing folders that were created before the limit was set to 0 can still be edited. This only affects the "Add folder" section.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@6723 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Dominik Dröscher 2006-12-07 12:40:55 +00:00
parent c848979cdd
commit 7428cdfd85
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/includes/ucp/ucp_pm_options.php
View File

@ -430,6 +430,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
'S_HOLD_CHECKED' => $s_hold_checked, 'S_HOLD_CHECKED' => $s_hold_checked,
'S_MOVE_CHECKED' => $s_move_checked, 'S_MOVE_CHECKED' => $s_move_checked,
'S_MAX_FOLDER_REACHED' => ($num_user_folder >= $config['pm_max_boxes']) ? true : false, 'S_MAX_FOLDER_REACHED' => ($num_user_folder >= $config['pm_max_boxes']) ? true : false,
'S_MAX_FOLDER_ZERO' => ($config['pm_max_boxes'] == 0) ? true : false,
'DEFAULT_ACTION' => ($config['full_folder_action'] == 1) ? $user->lang['DELETE_OLDEST_MESSAGES'] : $user->lang['HOLD_NEW_MESSAGES'], 'DEFAULT_ACTION' => ($config['full_folder_action'] == 1) ? $user->lang['DELETE_OLDEST_MESSAGES'] : $user->lang['HOLD_NEW_MESSAGES'],

2
phpBB/language/en/ucp.php
View File

@ -245,7 +245,7 @@ $lang = array_merge($lang, array(
'MARK_IMPORTANT' => 'Mark as important', 'MARK_IMPORTANT' => 'Mark as important',
'MARKED_MESSAGE' => 'Marked message', 'MARKED_MESSAGE' => 'Marked message',
'MAX_FOLDER_REACHED' => 'Maximum number of allowed user defined folder reached', 'MAX_FOLDER_REACHED' => 'Maximum number of allowed user defined folders reached',
'MESSAGE_BY_AUTHOR' => 'by', 'MESSAGE_BY_AUTHOR' => 'by',
'MESSAGE_COLOURS' => 'Message colours', 'MESSAGE_COLOURS' => 'Message colours',
'MESSAGE_DELETED' => 'Message successfully deleted', 'MESSAGE_DELETED' => 'Message successfully deleted',

2
phpBB/styles/subSilver/template/ucp_pm_options.html
View File

@ -113,6 +113,7 @@
<div style="padding: 2px;"></div> <div style="padding: 2px;"></div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF not S_MAX_FOLDER_ZERO -->
<table class="tablebg" width="100%" cellspacing="1"> <table class="tablebg" width="100%" cellspacing="1">
<tr> <tr>
<th colspan="2">{L_ADD_FOLDER}</th> <th colspan="2">{L_ADD_FOLDER}</th>
@ -131,6 +132,7 @@
</tr> </tr>
<!-- ENDIF --> <!-- ENDIF -->
</table> </table>
<!-- ENDIF -->
<div style="padding: 2px;"></div> <div style="padding: 2px;"></div>