diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-10-17 16:44:08 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-10-17 16:44:08 +0200 |
| commit | c6e370d33abd64fa928c4d438a75458518d0c8da (patch) | |
| tree | 5dbf917513a8fbd9a077d34b82e5be95974f8863 /phpBB | |
| parent | 88d064b6f44624b3a401e84d71188fb1dec564f5 (diff) | |
| parent | cfb51358058e30e4303c1fdc10920c98a568871d (diff) | |
| download | forums-c6e370d33abd64fa928c4d438a75458518d0c8da.tar forums-c6e370d33abd64fa928c4d438a75458518d0c8da.tar.gz forums-c6e370d33abd64fa928c4d438a75458518d0c8da.tar.bz2 forums-c6e370d33abd64fa928c4d438a75458518d0c8da.tar.xz forums-c6e370d33abd64fa928c4d438a75458518d0c8da.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9525] Minimum post length 0 is accepted but not working.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index f27a133eb5..7669ecb554 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -189,7 +189,7 @@ class acp_board 'hot_threshold' => array('lang' => 'HOT_THRESHOLD', 'validate' => 'int:0', 'type' => 'text:3:4', 'explain' => true), 'max_poll_options' => array('lang' => 'MAX_POLL_OPTIONS', 'validate' => 'int:2:127', 'type' => 'text:4:4', 'explain' => false), 'max_post_chars' => array('lang' => 'CHAR_LIMIT', 'validate' => 'int:0', 'type' => 'text:4:6', 'explain' => true), - 'min_post_chars' => array('lang' => 'MIN_CHAR_LIMIT', 'validate' => 'int:0', 'type' => 'text:4:6', 'explain' => true), + 'min_post_chars' => array('lang' => 'MIN_CHAR_LIMIT', 'validate' => 'int:1', 'type' => 'text:4:6', 'explain' => true), 'max_post_smilies' => array('lang' => 'SMILIES_LIMIT', 'validate' => 'int:0', 'type' => 'text:4:4', 'explain' => true), 'max_post_urls' => array('lang' => 'MAX_POST_URLS', 'validate' => 'int:0', 'type' => 'text:5:4', 'explain' => true), 'max_post_font_size' => array('lang' => 'MAX_POST_FONT_SIZE', 'validate' => 'int:0', 'type' => 'text:5:4', 'explain' => true, 'append' => ' %'), diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index abf346137d..44079bc0a2 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -174,7 +174,7 @@ $lang = array_merge($lang, array( 'MAX_POST_URLS' => 'Maximum links per post', 'MAX_POST_URLS_EXPLAIN' => 'Maximum number of URLs in a post. Set to 0 for unlimited links.', 'MIN_CHAR_LIMIT' => 'Minimum characters per post/message', - 'MIN_CHAR_LIMIT_EXPLAIN' => 'The minimum number of characters the user need to enter within a post/private message.', + 'MIN_CHAR_LIMIT_EXPLAIN' => 'The minimum number of characters the user need to enter within a post/private message. The minimum for this setting is 1.', 'POSTING' => 'Posting', 'POSTS_PER_PAGE' => 'Posts per page', 'QUOTE_DEPTH_LIMIT' => 'Maximum nesting depth for quotes', |