diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-07 04:47:38 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-07 04:47:38 +0000 |
| commit | 39f4d7245c0cb5e258b0ca6ec7fd31df6699408d (patch) | |
| tree | 2dfedf0cbfff6d68d94d3afef3786dbbd1e1adff /modules/overlay | |
| parent | 6f607b80cf64d0006fbe2b3a1b7c11e417d829b7 (diff) | |
| download | brdo-39f4d7245c0cb5e258b0ca6ec7fd31df6699408d.tar.gz brdo-39f4d7245c0cb5e258b0ca6ec7fd31df6699408d.tar.bz2 | |
#651722 by casey and ksenzee: Fixed / in URL fragments gets converted to %2F.
Diffstat (limited to 'modules/overlay')
| -rw-r--r-- | modules/overlay/overlay-parent.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/overlay/overlay-parent.js b/modules/overlay/overlay-parent.js index 1cb4f0392..098d336da 100644 --- a/modules/overlay/overlay-parent.js +++ b/modules/overlay/overlay-parent.js @@ -796,8 +796,12 @@ Drupal.overlay.fragmentizeLink = function (link) { var destination = path + link.search + link.hash; // Assemble the overlay-ready link. - var base = window.location.href; - return $.param.fragment(base, {'overlay':destination}); + var newLink = $.param.fragment(window.location.href, { overlay: destination }); + // $.param.fragment() escaped slashes in the overlay part: unescape them. + var regexp = new RegExp("[#&]overlay=" + encodeURIComponent(path)); + newLink = newLink.replace(regexp, decodeURIComponent); + + return newLink; }; /** |