Skip to content

Commit

Permalink
fix menu helper bc break introduced by zendframework#5650
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefano Torresi committed Mar 6, 2014
1 parent 8e3222b commit b931996
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions library/Zend/View/Helper/Navigation/Menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ protected function renderDeepestMenu(
$maxDepth,
$escapeLabels,
$addClassToListItem,
$liActiveClass
$liActiveClass = null
) {
if (!$active = $this->findActive($container, $minDepth - 1, $maxDepth)) {
return '';
Expand Down Expand Up @@ -164,7 +164,7 @@ protected function renderDeepestMenu(
$liClasses = array();
// Is page active?
if ($subPage->isActive(true)) {
$liClasses[] = $liActiveClass;
$liClasses[] = $liActiveClass ?: $this->getLiActiveClass();
}
// Add CSS class from page to <li>
if ($addClassToListItem && $subPage->getClass()) {
Expand Down Expand Up @@ -256,7 +256,7 @@ protected function renderNormalMenu(
$onlyActive,
$escapeLabels,
$addClassToListItem,
$liActiveClass
$liActiveClass = null
) {
$html = '';

Expand Down Expand Up @@ -337,7 +337,7 @@ protected function renderNormalMenu(
$liClasses = array();
// Is page active?
if ($isActive) {
$liClasses[] = $liActiveClass;
$liClasses[] = $liActiveClass ?: $this->getLiActiveClass();
}
// Add CSS class from page to <li>
if ($addClassToListItem && $page->getClass()) {
Expand Down

0 comments on commit b931996

Please sign in to comment.