From fce6751316a6d0d22be32a3f14524ed1bf60c77c Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Thu, 30 Dec 2021 07:06:37 +0000
Subject: [PATCH] * Fix bug#18046 and adjust code

---
 module/gitlab/view/browsetagpriv.html.php | 2 +-
 module/repo/model.php                     | 6 +++++-
 module/repo/view/ajaxsidecommits.html.php | 3 +--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/gitlab/view/browsetagpriv.html.php b/module/gitlab/view/browsetagpriv.html.php
index ec8a5bd065..8e56623852 100644
--- a/module/gitlab/view/browsetagpriv.html.php
+++ b/module/gitlab/view/browsetagpriv.html.php
@@ -29,7 +29,7 @@
     </div>
   </div>
   <div class="btn-toolbar pull-right">
-    <?php if(common::hasPriv('gitlab', 'createTag')) common::printLink('gitlab', 'createTagPriv', "gitlabID=$gitlabID&projectID=$projectID", "<i class='icon icon-plus'></i> " . $lang->gitlab->createTagPriv, '', "class='btn btn-primary'");?>
+    <?php common::printLink('gitlab', 'createTagPriv', "gitlabID=$gitlabID&projectID=$projectID", "<i class='icon icon-plus'></i> " . $lang->gitlab->createTagPriv, '', "class='btn btn-primary'");?>
   </div>
 </div>
 <?php if(empty($gitlabTagList)):?>
diff --git a/module/repo/model.php b/module/repo/model.php
index 185b7dda64..d1302ee9a2 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -581,7 +581,11 @@ class repoModel extends model
         if($entry == '/' or empty($entry))$comments->page($pager, 't1.id');
         $comments = $comments->fetchAll('revision');
 
-        foreach($comments as $repoComment) $repoComment->comment = $this->replaceCommentLink($repoComment->comment);
+        foreach($comments as $repoComment)
+        {
+            $repoComment->originalComment = $repoComment->comment;
+            $repoComment->comment         = $this->replaceCommentLink($repoComment->comment);
+        }
         return $comments;
     }
 
diff --git a/module/repo/view/ajaxsidecommits.html.php b/module/repo/view/ajaxsidecommits.html.php
index ad16a62fc8..203609b6b6 100644
--- a/module/repo/view/ajaxsidecommits.html.php
+++ b/module/repo/view/ajaxsidecommits.html.php
@@ -43,8 +43,7 @@ if(isset($entry)) $pathInfo .= '&type=file';
         <?php endif;?>
         <td><?php echo substr($log->time, 0, 10);?></td>
         <td><?php echo $log->committer;?></td>
-        <?php $comment = htmlSpecialString($log->comment, ENT_QUOTES);?>
-        <td title='<?php echo $comment?>' class='comment'><?php echo $log->comment?></td>
+        <td title='<?php echo $log->originalComment?>' class='comment'><?php echo $log->comment?></td>
       </tr>
       <?php endforeach;?>
     </tbody>