Merged in Mytskine/yii-bootstrap/fix_BootMenu (pull request #18)

379b067a · Christoffer Niska · b6170f31 · 707c01ae · 379b067a · 379b067a
Commit 379b067a authored Apr 24, 2012 by Christoffer Niska
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

BootDropdown.php widgets/BootDropdown.php +4 -0

BootMenu.php widgets/BootMenu.php +4 -0

No files found.
--- a/widgets/BootDropdown.php
+++ b/widgets/BootDropdown.php
@@ -96,6 +96,10 @@ class BootDropdown extends BootBaseMenu
 				continue;
 			}

+			if (!is_array($item)) {
+				continue;
+			}
+
 			if (!isset($item['label']))
 				$item['label'] = '';


--- a/widgets/BootMenu.php
+++ b/widgets/BootMenu.php
@@ -179,6 +179,10 @@ class BootMenu extends BootBaseMenu
 				continue;
 			}

+			if (!is_array($item)) {
+				continue;
+			}
+
 			if (!isset($item['label']))
 				$item['label'] = '';