diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-05-31 11:55:12 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-05-31 11:55:12 +0200 |
| commit | 7edb52b9be73a5e6e15a4b0bd2d408addcdeb917 (patch) | |
| tree | 434e5f3191b9daef754e7a2f288d69647299210a /phpBB/language/en/acp/attachments.php | |
| parent | 54bd800dabb189542b885a490c679efe615017b0 (diff) | |
| parent | 0261a9acffd47beb5b40bfa58d987e44b5ebf0c3 (diff) | |
| download | forums-7edb52b9be73a5e6e15a4b0bd2d408addcdeb917.tar forums-7edb52b9be73a5e6e15a4b0bd2d408addcdeb917.tar.gz forums-7edb52b9be73a5e6e15a4b0bd2d408addcdeb917.tar.bz2 forums-7edb52b9be73a5e6e15a4b0bd2d408addcdeb917.tar.xz forums-7edb52b9be73a5e6e15a4b0bd2d408addcdeb917.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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/en/acp/attachments.php')
| -rw-r--r-- | phpBB/language/en/acp/attachments.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index e43bd1d3b0..c7d68d29c2 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -56,7 +56,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', |