mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +02:00
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
This commit is contained in:
@@ -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',
|
||||
|
@@ -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.',
|
||||
));
|
||||
|
Reference in New Issue
Block a user