gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix option to import files locally appearing as not available

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2020-04-01 21:03:45 -03:00
parent 4c41f85a0b
commit 7a59527236
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
5.0.3 (not yet released)
- issue #15983 Require twig ^2.9
- issue Move Sass to the development dependencies
- issue Fix option to import files locally appearing as not available
5.0.2 (2020-03-20)
- issue Fixed deprecation warning "implode(): Passing glue string after array is deprecated." function on export page

4
templates/display/import/import.twig
View File

@ -82,13 +82,13 @@
{% elseif is_upload %}
{{ get_browse_upload_file_block(max_upload_size) }}
<p>{% trans 'You may also drag and drop a file on any page.' %}</p>
{% elseif not is_upload %}
{{ 'File uploads are not allowed on this server.'|trans|notice }}
{% elseif upload_dir is not empty %}
{{ get_select_upload_file_block(
import_list,
upload_dir
) }}
{% else %}
{{ 'File uploads are not allowed on this server.'|trans|notice }}
{% endif %}
</div>