aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorDominik Dröscher <dhn2@users.sourceforge.net>2006-12-07 12:40:55 +0000
committerDominik Dröscher <dhn2@users.sourceforge.net>2006-12-07 12:40:55 +0000
commit7428cdfd8542adf7e11e8e94575aeaf3ad0abb57 (patch)
tree78395c6cd70ff9fd96f5bf4277a4b8273fd1cf12 /phpBB/includes
parentc848979cdd668d4188ef921ee2f214cef595abf4 (diff)
downloadforums-7428cdfd8542adf7e11e8e94575aeaf3ad0abb57.tar
forums-7428cdfd8542adf7e11e8e94575aeaf3ad0abb57.tar.gz
forums-7428cdfd8542adf7e11e8e94575aeaf3ad0abb57.tar.bz2
forums-7428cdfd8542adf7e11e8e94575aeaf3ad0abb57.tar.xz
forums-7428cdfd8542adf7e11e8e94575aeaf3ad0abb57.zip
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.
git-svn-id: file:///svn/phpbb/trunk@6723 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/ucp/ucp_pm_options.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php
index 9ce7f87740..da451b999c 100644
--- a/phpBB/includes/ucp/ucp_pm_options.php
+++ b/phpBB/includes/ucp/ucp_pm_options.php
@@ -430,6 +430,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
'S_HOLD_CHECKED' => $s_hold_checked,
'S_MOVE_CHECKED' => $s_move_checked,
'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'],