Skip to content

Commit

Permalink
Merge pull request #70 from thePanz/patch-1
Browse files Browse the repository at this point in the history
Fixed usage of non-Twig paths in profiler panel
  • Loading branch information
Seldaek authored Aug 8, 2017
2 parents c4223a7 + dc27356 commit e7e137a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion Resources/config/logger.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
</parameters>
<services>
<service id="solarium.data_collector" class="%solarium.data_collector.class%">
<tag name="data_collector" template="NelmioSolariumBundle:DataCollector:solarium" id="solr" />
<tag name="data_collector"
template="@NelmioSolarium/DataCollector/solarium"
id="solr"
/>
<tag name="monolog.logger" channel="solr" />
<call method="setLogger">
<argument type="service" id="logger" on-invalid="ignore" />
Expand Down
4 changes: 2 additions & 2 deletions Resources/views/DataCollector/solarium.html.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends app.request.isXmlHttpRequest ? 'WebProfilerBundle:Profiler:ajax_layout.html.twig' : 'WebProfilerBundle:Profiler:layout.html.twig' %}
{% extends app.request.isXmlHttpRequest ? '@WebProfiler/Profiler/ajax_layout.html.twig' : '@WebProfiler/Profiler/layout.html.twig' %}

{% block toolbar %}
{% if collector.querycount > 0 %}
Expand Down Expand Up @@ -29,7 +29,7 @@
<span>{{ '%0.2f'|format(collector.totaltime * 1000) }} ms</span>
</div>
{% endset %}
{% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': profiler_url } %}
{% include '@WebProfiler/Profiler/toolbar_item.html.twig' with { 'link': profiler_url } %}
{% endif %}
{% endblock %}

Expand Down

0 comments on commit e7e137a

Please sign in to comment.