From fa8ddc3179ace6ff18c0df8bb0e2d11ffb1b6ca2 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Tue, 25 Sep 2012 22:22:56 +0800
Subject: Bug 783091:  Missing links when there are multiple "review?(foo)"
 shown in attachment box on show_bug.cgi

---
 .../template/en/default/hook/bug/comments-aftercomments.html.tmpl      | 3 +--
 extensions/InlineHistory/web/inline-history.js                         | 3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'extensions/InlineHistory')

diff --git a/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl b/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl
index b8a01aa75..1c47fd21c 100644
--- a/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl
+++ b/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl
@@ -18,14 +18,13 @@
     var html = '';
     [% has_cc = 0 %]
     [% has_flag = 0 %]
-    [% changer_identity = "" %]
+    [% changer_identity = operation.who.identity %]
     [% changer_login = operation.who.login %]
     [% change_date = operation.when FILTER time %]
 
     [% FOREACH change = operation.changes %]
       [%# track flag changes %]
       [% IF change.fieldname == 'flagtypes.name' && change.added != '' %]
-        [% changer_identity = operation.who.identity UNLESS changer_identity %]
         var item = new Array(5);
         item[0] = '[% changer_login FILTER js %]';
         item[1] = '[% change_date FILTER js %]';
diff --git a/extensions/InlineHistory/web/inline-history.js b/extensions/InlineHistory/web/inline-history.js
index e07872c9e..973ae09ec 100644
--- a/extensions/InlineHistory/web/inline-history.js
+++ b/extensions/InlineHistory/web/inline-history.js
@@ -264,7 +264,7 @@ var inline_history = {
           ) {
             html +=
               setterSpan + ': '
-              + '<a href="#' + flagItem[5] + '">' + flag + '</a>'
+              + '<a href="#' + flagItem[5] + '">' + flag + '</a> '
               + requestee + '<br>';
             found = true;
             break;
@@ -373,6 +373,7 @@ var inline_history = {
   },
 
   htmlDecode: function(v) {
+    if (!v.match(/&/)) return v;
     var e = document.createElement('textarea');
     e.innerHTML = v;
     return e.value;
-- 
cgit v1.2.3-24-g4f1b