diff options
author | Cash Costello <cash.costello@gmail.com> | 2011-12-22 08:12:07 -0500 |
---|---|---|
committer | Cash Costello <cash.costello@gmail.com> | 2011-12-22 08:12:07 -0500 |
commit | e49df853b2cc3a6a9bc2dd527a64951050142eb9 (patch) | |
tree | 6f485b560f89331c65fad3993e055a1834b07177 /views/default/navigation/menu/elements/item.php | |
parent | 5e5b3705a5ca7b66dfe386490c5570af88b49009 (diff) | |
parent | fea599f1653d7206e34ac33c0c0a668cb587bc20 (diff) | |
download | elgg-e49df853b2cc3a6a9bc2dd527a64951050142eb9.tar.gz elgg-e49df853b2cc3a6a9bc2dd527a64951050142eb9.tar.bz2 |
Merge branch '1.8' after 1.8.2 release
Conflicts:
version.php
Diffstat (limited to 'views/default/navigation/menu/elements/item.php')
-rw-r--r-- | views/default/navigation/menu/elements/item.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/views/default/navigation/menu/elements/item.php b/views/default/navigation/menu/elements/item.php index 5d6a7e367..22383ce0b 100644 --- a/views/default/navigation/menu/elements/item.php +++ b/views/default/navigation/menu/elements/item.php @@ -4,6 +4,9 @@ * * @package Elgg.Core * @subpackage Navigation + * + * @uses $vars['item'] ElggMenuItem + * @uses $vars['item_class'] Additional CSS class for the menu item */ $item = $vars['item']; @@ -21,6 +24,9 @@ if ($children) { } $item_class = $item->getItemClass(); +if (isset($vars['item_class']) && $vars['item_class']) { + $item_class .= ' ' . $vars['item_class']; +} echo "<li class=\"$item_class\">"; echo $item->getContent(); |