diff --git a/core/misc/active-link.es6.js b/core/misc/active-link.es6.js index 425e4f1c98..3b6c07fe54 100644 --- a/core/misc/active-link.es6.js +++ b/core/misc/active-link.es6.js @@ -22,7 +22,7 @@ attach(context) { // Start by finding all potentially active links. const path = drupalSettings.path; - const queryString = JSON.stringify(path.currentQuery); + const queryString = JSON.stringify(path.currentQuery).replace(/'/g, '\\\''); const querySelector = path.currentQuery ? `[data-drupal-link-query='${queryString}']` : ':not([data-drupal-link-query])'; const originalSelectors = [`[data-drupal-link-system-path="${path.currentPath}"]`]; let selectors; diff --git a/core/misc/active-link.js b/core/misc/active-link.js index 69651211fb..4fef9dc0f5 100644 --- a/core/misc/active-link.js +++ b/core/misc/active-link.js @@ -9,7 +9,7 @@ Drupal.behaviors.activeLinks = { attach: function attach(context) { var path = drupalSettings.path; - var queryString = JSON.stringify(path.currentQuery); + var queryString = JSON.stringify(path.currentQuery).replace(/'/g, '\\\''); var querySelector = path.currentQuery ? '[data-drupal-link-query=\'' + queryString + '\']' : ':not([data-drupal-link-query])'; var originalSelectors = ['[data-drupal-link-system-path="' + path.currentPath + '"]']; var selectors = void 0; @@ -44,4 +44,4 @@ } } }; -})(Drupal, drupalSettings); \ No newline at end of file +})(Drupal, drupalSettings);