From 71d2f8388d90cd7e218513f35c3b9750cd96022d Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 29 Nov 2019 14:32:40 +0100
Subject: [PATCH] Rename a variable

---
 www/common/outer/userObject.js | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/www/common/outer/userObject.js b/www/common/outer/userObject.js
index ef81fd14c..5a2693fd9 100644
--- a/www/common/outer/userObject.js
+++ b/www/common/outer/userObject.js
@@ -769,18 +769,18 @@ define([
                         continue;
                     }
 
-                    var href;
+                    var decryptedHref;
                     try {
-                        href = el.href && ((el.href.indexOf('#') !== -1) ? el.href : exp.cryptor.decrypt(el.href));
+                        decryptedHref = el.href && ((el.href.indexOf('#') !== -1) ? el.href : exp.cryptor.decrypt(el.href));
                     } catch (e) {}
 
-                    if (href && href.indexOf('#') === -1) {
+                    if (decryptedHref && decryptedHref.indexOf('#') === -1) {
                         // If we can't decrypt the href, it means we don't have the correct secondaryKey and we're in readOnly mode:
                         // abort now, we won't be able to fix anything anyway
                         continue;
                     }
 
-                    var parsed = Hash.parsePadUrl(href || el.roHref);
+                    var parsed = Hash.parsePadUrl(decryptedHref || el.roHref);
                     var secret;
 
                     // Clean invalid hash
@@ -797,9 +797,9 @@ define([
                     }
 
                     // If we have an edit link, check the view link
-                    if (href && parsed.hashData.type === "pad" && parsed.hashData.version) {
+                    if (decryptedHref && parsed.hashData.type === "pad" && parsed.hashData.version) {
                         if (parsed.hashData.mode === "view") {
-                            el.roHref = href;
+                            el.roHref = decryptedHref;
                             delete el.href;
                         } else if (!el.roHref) {
                             secret = Hash.getSecrets(parsed.type, parsed.hash, el.password);
@@ -818,7 +818,9 @@ define([
                     }
 
                     // Fix href
-                    if (href && href.slice(0,1) !== '/') { el.href = exp.cryptor.encrypt(Hash.getRelativeHref(href)); }
+                    if (decryptedHref && decryptedHref.slice(0,1) !== '/') {
+                        el.href = exp.cryptor.encrypt(Hash.getRelativeHref(decryptedHref));
+                    }
                     // Fix creation time
                     if (!el.ctime) { el.ctime = el.atime; }
                     // Fix title