diff options
| author | Rubén Calvo <rubencm@gmail.com> | 2018-05-27 00:06:17 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-08 22:28:56 +0200 |
| commit | dc397755d52639bf397bfba2c676438ab4f4d43d (patch) | |
| tree | 7cac97ff18e5a04231743917816affd054d09343 | |
| parent | 4ff986f5789b2c7dc5a8b16d8780a5a7ed2ece2d (diff) | |
| download | forums-dc397755d52639bf397bfba2c676438ab4f4d43d.tar forums-dc397755d52639bf397bfba2c676438ab4f4d43d.tar.gz forums-dc397755d52639bf397bfba2c676438ab4f4d43d.tar.bz2 forums-dc397755d52639bf397bfba2c676438ab4f4d43d.tar.xz forums-dc397755d52639bf397bfba2c676438ab4f4d43d.zip | |
[ticket/15671] Load extensions from a variable instead of harcode it
PHPBB3-15671
| -rw-r--r-- | phpBB/adm/style/acp_avatar_options_upload.html | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_avatar_options_upload.html | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html index 75bd1802d4..4b067c00f8 100644 --- a/phpBB/adm/style/acp_avatar_options_upload.html +++ b/phpBB/adm/style/acp_avatar_options_upload.html @@ -1,6 +1,6 @@ <dl> <dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt> - <dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" accept=".gif,.jpg,.jpeg,.png" /></dd> + <dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" accept="{% for EXTENSION in AVATAR_ALLOWED_EXTENSIONS %}.{{ EXTENSION }}{% if not loop.last %},{% endif %}{% endfor %}" /></dd> </dl> <!-- IF S_UPLOAD_AVATAR_URL --> diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index a012bb15b6..17e6dbcca1 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -84,6 +84,7 @@ class upload extends \phpbb\avatar\driver\driver $template->assign_vars(array( 'S_UPLOAD_AVATAR_URL' => ($this->config['allow_avatar_remote_upload']) ? true : false, 'AVATAR_UPLOAD_SIZE' => $this->config['avatar_filesize'], + 'AVATAR_ALLOWED_EXTENSIONS' => $this->allowed_extensions, )); return true; diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html index 75bd1802d4..4b067c00f8 100644 --- a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html +++ b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html @@ -1,6 +1,6 @@ <dl> <dt><label for="avatar_upload_file">{L_UPLOAD_AVATAR_FILE}{L_COLON}</label></dt> - <dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" accept=".gif,.jpg,.jpeg,.png" /></dd> + <dd><input type="hidden" name="MAX_FILE_SIZE" value="{AVATAR_UPLOAD_SIZE}" /><input type="file" name="avatar_upload_file" id="avatar_upload_file" class="inputbox autowidth" accept="{% for EXTENSION in AVATAR_ALLOWED_EXTENSIONS %}.{{ EXTENSION }}{% if not loop.last %},{% endif %}{% endfor %}" /></dd> </dl> <!-- IF S_UPLOAD_AVATAR_URL --> |