From 4a07c2324f8fe030f27f359f0906737f2e487eda Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 18 Nov 2021 21:41:48 +0800
Subject: [PATCH] * Fix bug #16385 and fix an error.

---
 module/group/view/manageview.html.php | 2 +-
 module/stakeholder/model.php          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/group/view/manageview.html.php b/module/group/view/manageview.html.php
index 77b2cb578f..ddaa99e4e2 100644
--- a/module/group/view/manageview.html.php
+++ b/module/group/view/manageview.html.php
@@ -26,7 +26,7 @@
           <?php foreach($lang->mainNav as $menuKey => $menu):?>
           <?php if(!is_string($menu)) continue;?>
           <?php list($moduleName, $module) = explode('|', $menu);?>
-          <?php if($module == 'my') continue;?>
+          <?php if($menuKey == 'my') continue;?>
           <?php $moduleName = strip_tags($moduleName);?>
           <div class='group-item'>
             <div class='checkbox-primary'>
diff --git a/module/stakeholder/model.php b/module/stakeholder/model.php
index 18b6e47045..f400c73c09 100644
--- a/module/stakeholder/model.php
+++ b/module/stakeholder/model.php
@@ -328,7 +328,7 @@ class stakeholderModel extends model
             }
         }
 
-        if(empty($parents)) return false;
+        if(empty($parents)) return array();
 
         /* Get all parent stakeholders.*/
         $parentStakeholders = $this->dao->select('objectID, user')->from(TABLE_STAKEHOLDER)->where('objectID')->in(array_keys($parents))->andWhere('deleted')->eq('0')->fetchAll();