From 7bfe6d767e725b892871e8eecbea8b279f637384 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 19 May 2022 15:48:35 +0800
Subject: [PATCH] * Fix bug #22688.

---
 module/mr/control.php                 | 2 ++
 module/mr/view/header.review.html.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/mr/control.php b/module/mr/control.php
index 497ba80482..a5a42e31e5 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -873,6 +873,8 @@ class mr extends control
         $this->loadModel('repo');
         if(!empty($_POST))
         {
+            $v1 = helper::safe64Decode($v1);
+            $v2 = helper::safe64Decode($v2);
             if($this->post->reviewType == 'bug')  $result = $this->mr->saveBug($repoID, $mr, $v1, $v2);
             if($this->post->reviewType == 'task') $result = $this->mr->saveTask($repoID, $mr, $v1, $v2);
             if($result['result'] == 'fail') return print(json_encode($result));
diff --git a/module/mr/view/header.review.html.php b/module/mr/view/header.review.html.php
index d6e2032306..ed459f3964 100644
--- a/module/mr/view/header.review.html.php
+++ b/module/mr/view/header.review.html.php
@@ -38,8 +38,8 @@ if($repoExecution)
 }
 
 $reviews = $this->mr->getReview($repoID, $MR->id);
-$v1      = str_replace('-', '*', $sourceBranch);
-$v2      = str_replace('-', '*', $targetBranch);
+$v1      = helper::safe64Encode($sourceBranch);
+$v2      = helper::safe64Encode($targetBranch);
 
 $this->loadModel('repo');