From 7f6d3b60ff17c037efec8d27a648edd02d076b01 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 13 Jun 2016 16:42:48 +0800
Subject: [PATCH]  * fix bug #857.

---
 module/project/view/taskheader.html.php  | 14 +++++++-------
 module/testcase/view/caseheader.html.php | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/module/project/view/taskheader.html.php b/module/project/view/taskheader.html.php
index c39dcdadb4..bc2841473d 100644
--- a/module/project/view/taskheader.html.php
+++ b/module/project/view/taskheader.html.php
@@ -29,17 +29,17 @@
     foreach(customModel::getFeatureMenu('project', 'task') as $menuItem)
     {
         if(isset($menuItem->hidden)) continue;
-        $type = $menuItem->name;
-        if(strpos($type, 'QUERY') === 0)
+        $menuType = $menuItem->name;
+        if(strpos($menuType, 'QUERY') === 0)
         {
-            $queryID = (int)substr($type, 5);
-            echo "<li id='{$type}Tab'>" . html::a(inlink('task', "project=$projectID&type=bySearch&param=$queryID"), $menuItem->text) . '</li>' ;
+            $queryID = (int)substr($menuType, 5);
+            echo "<li id='{$menuType}Tab'>" . html::a(inlink('task', "project=$projectID&type=bySearch&param=$queryID"), $menuItem->text) . '</li>' ;
         }
-        elseif($type != 'status')
+        elseif($menuType != 'status')
         {
-            echo "<li id='{$type}Tab'>" . html::a(inlink('task', "project=$projectID&type=$type"), $menuItem->text) . '</li>' ;
+            echo "<li id='{$menuType}Tab'>" . html::a(inlink('task', "project=$projectID&type=$menuType"), $menuItem->text) . '</li>' ;
         }
-        elseif($type == 'status')
+        elseif($menuType == 'status')
         {
             echo "<li id='statusTab' class='dropdown'>";
             $taskBrowseType = isset($status) ? $this->session->taskBrowseType : '';
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index 78f70976d9..f41de58277 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -21,17 +21,17 @@
     <?php foreach(customModel::getFeatureMenu('testcase', 'browse') as $menuItem):?>
     <?php
     if(isset($menuItem->hidden)) continue;
-    $type = $menuItem->name;
-    if($hasBrowsePriv and strpos($type, 'QUERY') === 0)
+    $menyType = $menuItem->name;
+    if($hasBrowsePriv and strpos($menyType, 'QUERY') === 0)
     {
-        $queryID = (int)substr($type, 5);
-        echo "<li id='{$type}Tab'>" . html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=bySearch&param=$queryID"), $menuItem->text) . "</li>";
+        $queryID = (int)substr($menyType, 5);
+        echo "<li id='{$menyType}Tab'>" . html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=bySearch&param=$queryID"), $menuItem->text) . "</li>";
     }
-    elseif($hasBrowsePriv and ($type == 'all' or $type == 'needconfirm'))
+    elseif($hasBrowsePriv and ($menyType == 'all' or $menyType == 'needconfirm'))
     {
-        echo "<li id='{$type}Tab'>" . html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=$type"), $menuItem->text) . "</li>";
+        echo "<li id='{$menyType}Tab'>" . html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=$menyType"), $menuItem->text) . "</li>";
     }
-    elseif($hasGroupPriv and $type == 'group')
+    elseif($hasGroupPriv and $menyType == 'group')
     {
         echo "<li id='groupTab' class='dropdown'>";
         $groupBy  = isset($groupBy) ? $groupBy : '';
@@ -47,7 +47,7 @@
         }
         echo '</ul></li>';
     }
-    elseif($hasZeroPriv and $type == 'zerocase')
+    elseif($hasZeroPriv and $menyType == 'zerocase')
     {
         echo "<li id='zerocaseTab'>" . html::a($this->createLink('story', 'zeroCase', "productID=$productID"), $lang->story->zeroCase) . '</li>';
     }