Browse Source

Fixes #1974.

tags/2.0.0-beta
Qiang Xue 11 years ago
parent
commit
c74db68ce7
  1. 2
      extensions/bootstrap/Nav.php
  2. 2
      framework/widgets/Menu.php

2
extensions/bootstrap/Nav.php

@ -202,7 +202,7 @@ class Nav extends Widget
unset($item['url']['#']); unset($item['url']['#']);
if (count($item['url']) > 1) { if (count($item['url']) > 1) {
foreach (array_splice($item['url'], 1) as $name => $value) { foreach (array_splice($item['url'], 1) as $name => $value) {
if (!isset($this->params[$name]) || $this->params[$name] != $value) { if ($value !== null && (!isset($this->params[$name]) || $this->params[$name] != $value)) {
return false; return false;
} }
} }

2
framework/widgets/Menu.php

@ -295,7 +295,7 @@ class Menu extends Widget
unset($item['url']['#']); unset($item['url']['#']);
if (count($item['url']) > 1) { if (count($item['url']) > 1) {
foreach (array_splice($item['url'], 1) as $name => $value) { foreach (array_splice($item['url'], 1) as $name => $value) {
if (!isset($this->params[$name]) || $this->params[$name] != $value) { if ($value !== null && (!isset($this->params[$name]) || $this->params[$name] != $value)) {
return false; return false;
} }
} }

Loading…
Cancel
Save