Merge branch 'liyuchun_fixbug' into 'master'

* Fix bug #23132.

See merge request easycorp/zentaopms!3710

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;
 

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;
     }
 

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'];