diff options
| author | Dries Buytaert <dries@buytaert.net> | 2011-05-14 08:33:39 -0400 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2011-05-14 08:33:39 -0400 |
| commit | 40f516cf3da0cece3865e5a8d1827375a67c3ac9 (patch) | |
| tree | 536d6169ef27b16d40cf217da4ad54b566b3be15 /modules/overlay | |
| parent | 7d1ae1167ddf733278841824aa0df7dab2f34661 (diff) | |
| download | brdo-40f516cf3da0cece3865e5a8d1827375a67c3ac9.tar.gz brdo-40f516cf3da0cece3865e5a8d1827375a67c3ac9.tar.bz2 | |
- Patch #759844 by jpmckinney, dixon_, plach, ksenzee, fabsor, pillarsdotnet: overlay does not work with prefixed URL paths.
Diffstat (limited to 'modules/overlay')
| -rw-r--r-- | modules/overlay/overlay-parent.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/overlay/overlay-parent.js b/modules/overlay/overlay-parent.js index 67c97b801..8f11df669 100644 --- a/modules/overlay/overlay-parent.js +++ b/modules/overlay/overlay-parent.js @@ -350,8 +350,9 @@ Drupal.overlay.isAdminLink = function (url) { // Turn the list of administrative paths into a regular expression. if (!this.adminPathRegExp) { - var adminPaths = '^(' + Drupal.settings.overlay.paths.admin.replace(/\s+/g, ')$|^(') + ')$'; - var nonAdminPaths = '^(' + Drupal.settings.overlay.paths.non_admin.replace(/\s+/g, ')$|^(') + ')$'; + var regExpPrefix = '^' + Drupal.settings.pathPrefix + '('; + var adminPaths = regExpPrefix + Drupal.settings.overlay.paths.admin.replace(/\s+/g, ')$|' + regExpPrefix) + ')$'; + var nonAdminPaths = regExpPrefix + Drupal.settings.overlay.paths.non_admin.replace(/\s+/g, ')$|'+ regExpPrefix) + ')$'; adminPaths = adminPaths.replace(/\*/g, '.*'); nonAdminPaths = nonAdminPaths.replace(/\*/g, '.*'); this.adminPathRegExp = new RegExp(adminPaths); |