kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge tag '4.7.17.3' into develop

Browse Source 
4.7.17.3

# Conflicts:
#	changelog.md
#	config/firefly.php
This commit is contained in:
James Cole
2019-07-16 19:24:07 +02:00
parent 2772a1bb3b 7d482aa24c
commit a42992efb0
8 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/v1/attachments/edit.twig
View File

@@ -18,8 +18,8 @@
<h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.staticText('filename',attachment.filename) }}
{{ ExpandedForm.staticText('mime',attachment.mime) }}
{{ ExpandedForm.staticText('filename',attachment.filename|escape) }}
{{ ExpandedForm.staticText('mime',attachment.mime|escape) }}
{{ ExpandedForm.staticText('size',attachment.size|filesize) }}
</div>
</div>

2
resources/views/v1/search/index.twig
View File

@@ -31,7 +31,7 @@
</div>
</form>
<p>
{{ trans('firefly.search_for_query', {query: query})|raw}}
{{ trans('firefly.search_for_query', {query: query|escape})|raw}}
</p>
{% if modifiers|length > 0 %}
<p>{{ trans('firefly.modifiers_applies_are') }}</p>