From 7428cdfd8542adf7e11e8e94575aeaf3ad0abb57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Dr=C3=B6scher?= <dhn2@users.sourceforge.net>
Date: Thu, 7 Dec 2006 12:40:55 +0000
Subject: [PATCH] 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
---
 phpBB/includes/ucp/ucp_pm_options.php               | 1 +
 phpBB/language/en/ucp.php                           | 2 +-
 phpBB/styles/subSilver/template/ucp_pm_options.html | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

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'],
 
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index fceafdaf02..2b999df15c 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -245,7 +245,7 @@ $lang = array_merge($lang, array(
 
 	'MARK_IMPORTANT'				=> 'Mark as important',
 	'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_COLOURS'				=> 'Message colours',
 	'MESSAGE_DELETED'				=> 'Message successfully deleted',
diff --git a/phpBB/styles/subSilver/template/ucp_pm_options.html b/phpBB/styles/subSilver/template/ucp_pm_options.html
index 05040e529a..ab3b6b9a26 100644
--- a/phpBB/styles/subSilver/template/ucp_pm_options.html
+++ b/phpBB/styles/subSilver/template/ucp_pm_options.html
@@ -113,6 +113,7 @@
 	<div style="padding: 2px;"></div>
 <!-- ENDIF -->
 
+<!-- IF not S_MAX_FOLDER_ZERO -->
 <table class="tablebg" width="100%" cellspacing="1">
 <tr>
 	<th colspan="2">{L_ADD_FOLDER}</th>
@@ -131,6 +132,7 @@
 	</tr>
 <!-- ENDIF -->
 </table>
+<!-- ENDIF -->
 
 <div style="padding: 2px;"></div>