From 29ceb630235f9a5ce9eb46456b06845b488140db Mon Sep 17 00:00:00 2001
From: liyuchun <563917701@qq.com>
Date: Thu, 2 Jun 2022 02:49:27 +0000
Subject: [PATCH]  * Fix bug #23132.

---
 lib/scm/gitlab.class.php  | 1 +
 module/testcase/model.php | 9 ++++++++-
 module/testtask/model.php | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/scm/gitlab.class.php b/lib/scm/gitlab.class.php
index a94bfdc9e8..8fa6b30095 100644
--- a/lib/scm/gitlab.class.php
+++ b/lib/scm/gitlab.class.php
@@ -359,6 +359,7 @@ class gitlab
             if($parent == '.') $parent = '/';
             if($parent == '')  $parent = '/';
             $list = $this->tree($parent, 0);
+            $file = new stdclass();
 
             foreach($list as $node) if($node->path == $entry) $file = $node;
 
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 51504e3f0a..acb1fb01c3 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -422,9 +422,16 @@ class testcaseModel extends model
 
         if($case->linkCase or $case->fromCaseID) $case->linkCaseTitles = $this->dao->select('id,title')->from(TABLE_CASE)->where('id')->in($case->linkCase)->orWhere('id')->eq($case->fromCaseID)->fetchPairs();
         if($version == 0) $version = $case->version;
-        $case->steps = $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->eq($caseID)->andWhere('version')->eq($version)->orderBy('id')->fetchAll('id');
         $case->files = $this->loadModel('file')->getByObject('testcase', $caseID);
         $case->currentVersion = $version ? $version : $case->version;
+
+        $case->steps = $this->dao->select('*')->from(TABLE_CASESTEP)->where('`case`')->eq($caseID)->andWhere('version')->eq($version)->orderBy('id')->fetchAll('id');
+        foreach($case->steps as $key => $step)
+        {
+            $step->desc   = html_entity_decode($step->desc);
+            $step->expect = html_entity_decode($step->expect);
+        }
+
         return $case;
     }
 
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 6946e7f513..9c8720028c 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1360,6 +1360,8 @@ class testtaskModel extends model
                 foreach($relatedStep as $stepID => $step)
                 {
                     $relatedStep[$stepID] = (array)$step;
+                    $relatedStep[$stepID]['desc']   = html_entity_decode($relatedStep[$stepID]['desc']);
+                    $relatedStep[$stepID]['expect'] = html_entity_decode($relatedStep[$stepID]['expect']);
                     if(isset($result->stepResults[$stepID]))
                     {
                         $relatedStep[$stepID]['result'] = $result->stepResults[$stepID]['result'];