diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-05-31 11:54:58 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-05-31 11:54:58 +0200 |
| commit | 0261a9acffd47beb5b40bfa58d987e44b5ebf0c3 (patch) | |
| tree | 89e0a2f3a0189b88b1cf46c8b7e3437606f9e96f /phpBB/language | |
| parent | 275dabbc4f7e412d6f21266d43708635f63384e2 (diff) | |
| parent | c494abc8c765f2398b0b782fc6979a5e033bb0f5 (diff) | |
| download | forums-0261a9acffd47beb5b40bfa58d987e44b5ebf0c3.tar forums-0261a9acffd47beb5b40bfa58d987e44b5ebf0c3.tar.gz forums-0261a9acffd47beb5b40bfa58d987e44b5ebf0c3.tar.bz2 forums-0261a9acffd47beb5b40bfa58d987e44b5ebf0c3.tar.xz forums-0261a9acffd47beb5b40bfa58d987e44b5ebf0c3.zip | |
Merge remote-tracking branch 'naderman/ticket/10908' into develop-olympus
* naderman/ticket/10908:
[ticket/10908] Document that 0 filesize configuration means limited by PHP
[ticket/10908] Download files only up to max_upload_filesize if limit is 0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/attachments.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 1821b8c867..6aeb3c2188 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -57,7 +57,7 @@ $lang = array_merge($lang, array( 'ATTACH_EXT_GROUPS_URL' => 'Extension groups', 'ATTACH_ID' => 'ID', 'ATTACH_MAX_FILESIZE' => 'Maximum file size', - 'ATTACH_MAX_FILESIZE_EXPLAIN' => 'Maximum size of each file, with 0 being unlimited.', + 'ATTACH_MAX_FILESIZE_EXPLAIN' => 'Maximum size of each file. If this value is 0, the uploadable filesize is only limited by your PHP configuration.', 'ATTACH_MAX_PM_FILESIZE' => 'Maximum file size messaging', 'ATTACH_MAX_PM_FILESIZE_EXPLAIN' => 'Maximum size of each file, with 0 being unlimited, attached to a private message.', 'ATTACH_ORPHAN_URL' => 'Orphan attachments', diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 6e6d4302cd..f24376f8aa 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -108,7 +108,7 @@ $lang = array_merge($lang, array( 'MAX_AVATAR_SIZE' => 'Maximum avatar dimensions', 'MAX_AVATAR_SIZE_EXPLAIN' => 'Width x Height in pixels.', 'MAX_FILESIZE' => 'Maximum avatar file size', - 'MAX_FILESIZE_EXPLAIN' => 'For uploaded avatar files.', + 'MAX_FILESIZE_EXPLAIN' => 'For uploaded avatar files. If this value is 0, the uploaded filesize is only limited by your PHP configuration.', 'MIN_AVATAR_SIZE' => 'Minimum avatar dimensions', 'MIN_AVATAR_SIZE_EXPLAIN' => 'Width x Height in pixels.', )); |