diff --git a/src/Tracy/assets/Bar/bar.js b/src/Tracy/assets/Bar/bar.js
index 7f6bc6f15..62baa00f7 100644
--- a/src/Tracy/assets/Bar/bar.js
+++ b/src/Tracy/assets/Bar/bar.js
@@ -4,6 +4,8 @@
(function(){
let nonce, contentId;
+ let baseUrl = location.href.split('#')[0];
+ baseUrl += (baseUrl.indexOf('?') < 0 ? '?' : '&');
class Panel
{
@@ -138,7 +140,7 @@
let doc = win.document;
doc.write(''
- + ''
+ + ''
+ ''
);
doc.body.innerHTML = '' + this.elem.innerHTML + '
';
@@ -454,7 +456,7 @@
this.setRequestHeader('X-Tracy-Ajax', header);
this.addEventListener('load', function() {
if (this.getAllResponseHeaders().match(/^X-Tracy-Ajax: 1/mi)) {
- Debug.loadScript('?_tracy_bar=content-ajax.' + header + '&XDEBUG_SESSION_STOP=1&v=' + Math.random());
+ Debug.loadScript(baseUrl + '_tracy_bar=content-ajax.' + header + '&XDEBUG_SESSION_STOP=1&v=' + Math.random());
}
});
}
@@ -469,7 +471,7 @@
request.headers.set('X-Tracy-Ajax', header);
return oldFetch(request).then((response) => {
if (response.headers.has('X-Tracy-Ajax') && response.headers.get('X-Tracy-Ajax')[0] === '1') {
- Debug.loadScript('?_tracy_bar=content-ajax.' + header + '&XDEBUG_SESSION_STOP=1&v=' + Math.random());
+ Debug.loadScript(baseUrl + '_tracy_bar=content-ajax.' + header + '&XDEBUG_SESSION_STOP=1&v=' + Math.random());
}
return response;
diff --git a/src/Tracy/assets/Bar/loader.phtml b/src/Tracy/assets/Bar/loader.phtml
index 265be4e14..da6750630 100644
--- a/src/Tracy/assets/Bar/loader.phtml
+++ b/src/Tracy/assets/Bar/loader.phtml
@@ -11,19 +11,20 @@
namespace Tracy;
-$baseUrl = isset($_SERVER['REQUEST_URI']) ? explode('?', $_SERVER['REQUEST_URI'])[0] : '';
+$baseUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
+$baseUrl .= strpos($baseUrl, '?') === false ? '?' : '&';
$nonceAttr = $nonce ? ' nonce="' . Helpers::escapeHtml($nonce) . '"' : '';
$asyncAttr = $async ? ' async' : '';
?>
-
+
-
+
>
Tracy.Debug.init(, );