Fixes #3408. During token refresh, only touching hrefs that contain __elgg_ts and...

git-svn-id: http://code.elgg.org/elgg/trunk@9049 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/js/lib/security.js b/js/lib/security.js
index fa0a6f7efda4a3b2b96bd41a5bcb72ee4e0c323d..486347b88ec3d8821f8edac01d5f4cc81863a3e9 100644 (file)
--- a/js/lib/security.js
+++ b/js/lib/security.js
@@ -21,8 +21,8 @@ elgg.security.setToken = function(json) {
        $('[name=__elgg_ts]').val(json.__elgg_ts);
        $('[name=__elgg_token]').val(json.__elgg_token);
 
-       //also update all links
-       $('[href]').each(function() {
+       // also update all links that contain tokens and time stamps
+       $('[href*="__elgg_ts"][href*="__elgg_token"]').each(function() {
                this.href = this.href
                        .replace(/__elgg_ts=\d*/, '__elgg_ts=' + json.__elgg_ts)
                        .replace(/__elgg_token=[0-9a-f]*/, '__elgg_token=' + json.__elgg_token);

diff --git a/js/lib/ui.js b/js/lib/ui.js
index 16f1f969c7baeeeba6f3460fc059d40fb4353774..85ca8caf17f9bd038fadb7cab496573dff9cf3e2 100644 (file)
--- a/js/lib/ui.js
+++ b/js/lib/ui.js
@@ -36,6 +36,7 @@ elgg.ui.init = function () {
 elgg.ui.toggles = function(event) {
        event.preventDefault();
 
+       // @todo might want to switch this to elgg.getSelectorFromUrlFragment().
        var target = $(this).toggleClass('elgg-state-active').attr('href');
 
        $(target).slideToggle('medium');