Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Smarter concat of query params in LeftAndMain.js

Broke when CMS URL already had query params,
such as ?locale=en_US with the Translatable module enabled.
With this patch it doesn't double-concat ?locale....
Still doubles query params, but that's acceptable
until we find a more solid URL manipulation lib for JS.
  • Loading branch information...
commit fa62c1b0ba718ff8d781f6eea9ec50a523c6f293 1 parent c07d4ec
@chillu chillu authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  admin/javascript/LeftAndMain.js
View
2  admin/javascript/LeftAndMain.js
@@ -670,7 +670,7 @@ jQuery.noConflict();
showDetailView: function(url) {
// Include any GET parameters from the current URL, as the view state might depend on it.
// For example, a list prefiltered through external search criteria might be passed to GridField.
- if(window.location.search) url += window.location.search;
+ url = $.path.addSearchParams(url, window.location.search.replace(/^\?/, ''));
$('.cms-container').loadPanel(url);
}
});
Please sign in to comment.
Something went wrong with that request. Please try again.