From 902963c8f6f024575629f4c4dbe1f686410a230f Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 25 Mar 2016 14:25:14 +0800 Subject: [PATCH] * fix bug for doc tree menu. --- module/tree/model.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/tree/model.php b/module/tree/model.php index 3c8203667b..b475af0e0b 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -605,16 +605,16 @@ class treeModel extends model $productModules = $this->getTreeMenu(0, 'productdoc', 0, array('treeModel', 'createDocLink'), 'product'); $startPos = strpos($productModules, 'getTreeMenu(0, 'projectdoc', 0, array('treeModel', 'createDocLink'), 'product'); $startPos = strpos($projectModules, '') - $startPos); + $projectModules = $startPos === false ? '' : substr($projectModules, $startPos, strrpos($projectModules, '') - $startPos); foreach($products as $productID =>$productName) { $menu .= '
  • '; $menu .= html::a(helper::createLink('doc', 'browse', "libID=product&module=0&productID=$productID"), $productName); - if(!empty($productModules)) + if(!empty($productModules) or !empty($projectModules)) { $menu .= '
      '; $menu .= str_replace('%productID%', $productID, $productModules); @@ -649,7 +649,7 @@ class treeModel extends model $projectModules = $this->getTreeMenu(0, 'projectdoc', 0, array('treeModel', 'createDocLink'), 'project'); $startPos = strpos($projectModules, ' $project) {