Merge branch '2.6'

# Conflicts:
#	src/Repository/EntryRepository.php
#	src/Twig/WallabagExtension.php
#	src/Wallabag/CoreBundle/Resources/views/Entry/_card_actions.html.twig
#	src/Wallabag/CoreBundle/Resources/views/Entry/_card_list.html.twig
#	tests/Twig/WallabagExtensionTest.php

templates/Entry/_card_actions.html.twig

@@ -7,7 +7,7 @@
         </div>
     </div>
 
-    {% set current_path = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) %}
+    {% set current_path = app.request.requesturi %}
 
     <ul class="tools right">
         {% if is_granted('LIST_ENTRIES') %}

templates/Entry/_card_list.html.twig

@@ -14,7 +14,7 @@
     {% endif %}
     {% include "Entry/Card/_content.html.twig" with {'entry': entry, 'withMetadata': true, 'subClass': 'metadata'} only %}
 
-    {% set current_path = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) %}
+    {% set current_path = app.request.requesturi %}
 
     <ul class="tools-list hide-on-small-only">
         <li>

templates/Entry/_title.html.twig

@@ -9,7 +9,7 @@
 {% elseif current_route == 'search' %}
     {{ 'entry.page_titles.filtered_search'|trans }} {{ filter }}
 {% elseif current_route == 'tag_entries' %}
-    {{ 'entry.page_titles.filtered_tags'|trans }} {{ filter }}
+    {{ 'entry.page_titles.filtered_tags'|trans }} {{ tag.label }}
 {% elseif current_route == 'untagged' %}
     {{ 'entry.page_titles.untagged'|trans }}
 {% elseif current_route == 'same_domain' %}

templates/Entry/entries.html.twig

@@ -46,7 +46,7 @@
 {% endblock %}
 
 {% block content %}
-    {% set current_path = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) %}
+    {% set current_path = app.request.requesturi %}
     {% set list_mode = app.user.config.listMode %}
     {% set entries_with_archived_class_routes = ['tag_entries', 'search', 'all'] %}
     {% set current_route = app.request.attributes.get('_route') %}