Skip to content

Commit 2a6f21e

Browse files
committed
Merge branch '4.6'
2 parents 815b00d + 2af1859 commit 2a6f21e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/bundle/Core/Resources/config/routing.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ services:
2727
- { name: kernel.event_subscriber }
2828

2929
Ibexa\Core\MVC\Symfony\Component\Serializer\CompoundMatcherNormalizer:
30-
tags:
31-
- { name: serializer.normalizer }
30+
autoconfigure: false
3231

3332
Ibexa\Core\MVC\Symfony\Routing\Generator:
3433
class: Ibexa\Core\MVC\Symfony\Routing\Generator

src/bundle/Core/Resources/views/content_fields.html.twig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,7 @@
445445
href="{{ parameters.ezlink.href }}"
446446
{% if parameters.ezlink.title is defined %} title="{{ parameters.ezlink.title|e('html_attr') }}"{% endif %}
447447
{% if parameters.ezlink.target is defined %} target="{{ parameters.ezlink.target|e('html_attr') }}"{% endif %}
448+
{% if parameters.ezlink.class is defined %} class="{{ parameters.ezlink.class|e('html_attr') }}"{% endif %}
448449
>
449450
{% endif %}
450451
<img src="{{ src }}" alt="{{ parameters.alternativeText|default(field.value.alternativeText) }}" {% for attrname, attrvalue in attrs %}{% if attrvalue %}{{ attrname }}="{{ attrvalue }}" {% endif %}{% endfor %}/>

0 commit comments

Comments
 (0)