From 867f5467d97f5efb2d009447ca051b6df83df70d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Tue, 26 Jul 2022 13:20:21 +0800
Subject: [PATCH] * Fix bug #25678.

---
 module/bug/control.php       | 2 +-
 module/execution/control.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 1ef0d988ce..53bd69e118 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1304,7 +1304,7 @@ class bug extends control
 
             $branchIdList[$bug->product][$bug->branch] = $bug->branch;
 
-            if(!isset($modules[$bug->product][$bug->branch])) $modules[$bug->product][$bug->branch] = $modules[$bug->product][0] + $this->tree->getModulesName($bug->module);
+            if(!isset($modules[$bug->product][$bug->branch]) and isset($modules[$bug->product])) $modules[$bug->product][$bug->branch] = $modules[$bug->product][0] + $this->tree->getModulesName($bug->module);
         }
 
         /* Get assigned to member. */
diff --git a/module/execution/control.php b/module/execution/control.php
index 910b2f08cc..2e014c1489 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -977,7 +977,7 @@ class execution extends control
         $memberPairs = $this->user->processAccountSort($memberPairs);
 
         /* Build the search form. */
-        $actionURL = $this->createLink('execution', 'bug', "executionID=$executionID&productID=$productID&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID");
+        $actionURL = $this->createLink('execution', 'bug', "executionID=$executionID&productID=$productID&branch=$branch&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID");
         $this->execution->buildBugSearchForm($products, $queryID, $actionURL);
 
         $product = $this->product->getById($productID);