* Fix bug #19231,19230.

This commit is contained in:
liyuchun
2022-03-21 10:15:36 +08:00
parent 1afae98bfc
commit 8efe478798
2 changed files with 4 additions and 2 deletions
+2 -2
View File
@@ -2786,7 +2786,7 @@ class execution extends control
$this->loadModel('branch');
foreach($products as $product)
{
$productModules = $this->tree->getOptionMenu($product->id, 'story', 0, array_keys($branches[$product->id]));
$productModules = $this->tree->getOptionMenu($product->id, 'story', 0, defined('TUTORIAL') ? array(0 => 0) : array_keys($branches[$product->id]));
foreach($productModules as $branch => $branchModules)
{
foreach($branchModules as $moduleID => $moduleName) $modules[$moduleID] = ((count($products) >= 2 and $moduleID != 0) ? $product->name : '') . $moduleName;
@@ -2825,7 +2825,7 @@ class execution extends control
{
$storyModule = $this->tree->getModulesName($story->module);
$productName = count($products) > 1 ? $products[$story->product]->name : '';
$modules[$story->module] = $productName . $storyModule[$story->module];
$modules[$story->module] = $productName . zget($storyModule, $story->module, '');
}
}