소스 검색

merged branch Seldaek/wdt (PR #1390)

Commits
-------

e272d56 [WebProfilerBundle] Fixes toolbar content check

Discussion
----------

[WebProfilerBundle] Fixes toolbar content check

It appears that some html optimizers trim the comments, therefore the old check was not working. This is more robust.

Fixes the issue reported in 8541a5bcbc97f965f4c53fc3ece790cdc4a922bf
Fabien Potencier 14 년 전
부모
커밋
73b22e5ad0
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig

+ 1 - 1
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig

@@ -11,7 +11,7 @@
         xhr.open('GET', '{{ path("_wdt", { "token": token }) }}', true);
         xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
         xhr.onreadystatechange = function(state) {
-            if (4 === xhr.readyState && 200 === xhr.status && '<!-- START' === xhr.responseText.substring(0, 10)) {
+            if (4 === xhr.readyState && 200 === xhr.status && -1 !== xhr.responseText.indexOf('sf-toolbarreset')) {
                 wdt.innerHTML = xhr.responseText;
                 wdt.style.display = 'block';
             }