* Merge 169 untrack file to master.

2021-12-09 10:34:47 +08:00
parent 32c7a078a7
commit 14b272a1af
49 changed files with 159 additions and 82 deletions
@@ -407,7 +407,16 @@ class bug extends control

            if($this->app->tab == 'execution')
            {
-                $location = $this->session->bugList ? $this->session->bugList : $this->createLink('execution', 'bug', "executionID={$output['executionID']}");
+                if(!preg_match("/(m=|\/)execution(&f=|-)bug(&|-|\.)?/", $this->session->bugList))
+                {
+                    $location = $this->session->bugList;
+                }
+                else
+                {
+                    $executionID = $this->post->execution ? $this->post->execution : $output['executionID'];
+                    $location    = $this->createLink('execution', 'bug', "executionID=$executionID");
+                }
+
            }
            elseif($this->app->tab == 'project')
            {