From: Moritz Bunkus Date: Mon, 19 Nov 2012 08:51:50 +0000 (+0100) Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp X-Git-Tag: release-3.0.0beta2~11^2~6 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/5931bb01914a73d37c0cb415ff8809f0c720c666?hp=1e3c858f21781400103974c67630cb1e49d6668a Merge branch 'master' of vc.linet-services.de:public/lx-office-erp --- diff --git a/SL/Layout/Css.pm b/SL/Layout/Css.pm index 883353a20..dc0bf057f 100644 --- a/SL/Layout/Css.pm +++ b/SL/Layout/Css.pm @@ -51,7 +51,7 @@ sub print_menu { my $menu_title = $::locale->text($item); my $menu_text = $menu_title; - if ($menu_item->{"submenu"} || !defined($menu_item->{"module"})) { + if ($menu_item->{"submenu"} || !defined($menu_item->{"module"}) && !defined($menu_item->{href})) { my $h = $self->print_menu("${parent}${item}", $depth * 1 + 1)."\n"; if (!$parent) { @@ -96,7 +96,7 @@ sub menuitem_v3 { my @vars = qw(module action target href); if ($menuitem->{href}) { - $str = qq|{href}|; + $str = qq|