projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unterstützung für andere Datenbankencodings als Unicode/UTF-8 entfernt
[kivitendo-erp.git]
/
SL
/
Layout
/
V3.pm
diff --git
a/SL/Layout/V3.pm
b/SL/Layout/V3.pm
index
713764f
..
03c6f3e
100644
(file)
--- a/
SL/Layout/V3.pm
+++ b/
SL/Layout/V3.pm
@@
-87,18
+87,20
@@
sub menuitem_v3 {
$action = $menuitem->{action};
}
$action = $menuitem->{action};
}
- my $level = $::form->escape($item);
+ my $level
= $::form->escape($item);
- my
$str = qq|<a href="$module?action=| . $::form->escape($action) . qq|&level=| . $::form->escape($level)
;
-
- my
@vars = qw(module action target href)
;
+ my
@vars
;
+ my $target = $menuitem->{target} ? qq| target="| . $::form->escape($menuitem->{target}) . '"' : '';
+ my
$str = qq|<a${target} href="|
;
if ($menuitem->{href}) {
if ($menuitem->{href}) {
- $
str = qq|<a href="$menuitem->{href}|
;
-
@vars = qw(module target href)
;
+ $
main::lxdebug->leave_sub()
;
+
return $str . $menuitem->{href} . '">'
;
}
}
- map { delete $menuitem->{$_} } @vars;
+ $str .= qq|$module?action=| . $::form->escape($action) . qq|&level=| . $::form->escape($level);
+
+ map { delete $menuitem->{$_} } qw(module action target href);
# add other params
foreach my $key (keys %{ $menuitem }) {
# add other params
foreach my $key (keys %{ $menuitem }) {
@@
-162,7
+164,7
@@
sub render {
$callback = URI->new($callback)->rel($callback) if $callback;
$callback = "login.pl?action=company_logo" if $callback =~ /^(\.\/)?$/;
$callback = URI->new($callback)->rel($callback) if $callback;
$callback = "login.pl?action=company_logo" if $callback =~ /^(\.\/)?$/;
- $self->
SUPER::render('menu/menuv3', { no_menu => 1, no_output => 1 }
,
+ $self->
presenter->render('menu/menuv3'
,
force_ul_width => 1,
date => $self->clock_line,
menu => $self->print_menu,
force_ul_width => 1,
date => $self->clock_line,
menu => $self->print_menu,