From dcc92004572d7441f2daa5a10394158269115cd5 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Thu, 9 Dec 2021 09:01:02 +0000
Subject: [PATCH 1/2] * Adjust code

---
 module/mr/view/diff.html.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/mr/view/diff.html.php b/module/mr/view/diff.html.php
index ac9a811c7b..80ef2ce225 100644
--- a/module/mr/view/diff.html.php
+++ b/module/mr/view/diff.html.php
@@ -55,10 +55,13 @@
             <div class='btn-toolbar'>
               <div class='btn-group'>
                 <div class='btn-group'>
+                  <?php $encoding = str_replace('-', '_', $encoding);?>
                   <?php echo html::commonButton(zget($lang->repo->encodingList, $encoding, $lang->repo->encodingList['utf_8']) . "<span class='caret'></span>", "data-toggle='dropdown'", 'btn dropdown-toggle btn-sm')?>
                   <ul class='dropdown-menu' role='menu'>
                     <?php foreach($lang->repo->encodingList as $key => $val):?>
-                    <li><?php echo html::a('javascript:changeEncoding("'. $key . '")', $val)?></li>
+                    <?php echo '<li' . ($key == $encoding ? " class='active'" : '') . '>';?>
+                      <?php echo html::a('javascript:changeEncoding("'. $key . '")', $val)?>
+                    </li>
                     <?php endforeach;?>
                   </ul>
                 </div>

From ddc651efbb0296a9691b17e6b6993db7511ee17d Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Fri, 10 Dec 2021 09:01:31 +0800
Subject: [PATCH 2/2]  * Code for task #45445.

---
 module/mr/view/diff.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/mr/view/diff.html.php b/module/mr/view/diff.html.php
index 80ef2ce225..a2d835be88 100644
--- a/module/mr/view/diff.html.php
+++ b/module/mr/view/diff.html.php
@@ -59,7 +59,7 @@
                   <?php echo html::commonButton(zget($lang->repo->encodingList, $encoding, $lang->repo->encodingList['utf_8']) . "<span class='caret'></span>", "data-toggle='dropdown'", 'btn dropdown-toggle btn-sm')?>
                   <ul class='dropdown-menu' role='menu'>
                     <?php foreach($lang->repo->encodingList as $key => $val):?>
-                    <?php echo '<li' . ($key == $encoding ? " class='active'" : '') . '>';?>
+                    <li <?php echo $key == $encoding ? "class='active'" : '';?>>
                       <?php echo html::a('javascript:changeEncoding("'. $key . '")', $val)?>
                     </li>
                     <?php endforeach;?>