Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions Block/Menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -445,9 +445,15 @@ private function getSubmenuBlock($nodes, $parentNode, $level = 0)
{
$block = clone $this;
$submenuTemplate = $parentNode->getSubmenuTemplate();
$submenuTemplate = $submenuTemplate
? 'Snowdog_Menu::' . $this->getMenu()->getIdentifier() . "/menu/custom/sub_menu/{$submenuTemplate}.phtml"
: $this->submenuTemplate;

if ($submenuTemplate) {
$customSubmenuTemplate = 'Snowdog_Menu::' . $this->getMenu()->getIdentifier() . "/menu/custom/sub_menu/{$submenuTemplate}.phtml";
$submenuTemplate = $this->templateResolver->isValidTemplate($block, $customSubmenuTemplate)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@manan-patel1 isValidTemplate does a filesystem call. Since this is running for every submenu item, the validity should be cached. Take a look at Model/TemplateResolver.php getMenuTemplate(). Check if you can use that instead.

? $customSubmenuTemplate
: $this->submenuTemplate;
} else {
$submenuTemplate = $this->submenuTemplate;
}

$block->setSubmenuNodes($nodes)
->setParentNode($parentNode)
Expand Down
10 changes: 10 additions & 0 deletions Model/TemplateResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,16 @@ public function getMenuTemplate($block, $menuId, $template, $nodeId = null)
return $this->setTemplateMap($menuId, $newTemplate, $template, $nodeId);
}

/**
* @param Template $block
* @param string $template
* @return bool
*/
public function isValidTemplate($block, $template)
{
return (bool) $this->validator->isValid($block->getTemplateFile($template));
}

/**
* @param string $nodeType
* @param string $defaultTemplateLabel
Expand Down