projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix für Bug 1081. Bei Buchung einer Einkaufsrechnung geht das Rabatt verloren. 1...
[kivitendo-erp.git]
/
bin
/
mozilla
/
menunew.pl
diff --git
a/bin/mozilla/menunew.pl
b/bin/mozilla/menunew.pl
index
ffb9afd
..
777c38c
100644
(file)
--- a/
bin/mozilla/menunew.pl
+++ b/
bin/mozilla/menunew.pl
@@
-34,6
+34,7
@@
use English qw(-no_match_vars);
use List::Util qw(max);
use English qw(-no_match_vars);
use List::Util qw(max);
+use URI;
use SL::Menu;
use SL::Menu;
@@
-49,7
+50,10
@@
sub display {
$form->{force_ul_width} = 1;
$form->{date} = clock_line();
$form->{menu_items} = acc_menu();
$form->{force_ul_width} = 1;
$form->{date} = clock_line();
$form->{menu_items} = acc_menu();
- $form->{callback} = $form->unescape($form->{callback}) || "login.pl?action=company_logo";
+ my $callback = $form->unescape($form->{callback});
+ $callback = URI->new($callback)->rel($callback) if $callback;
+ $callback = "login.pl?action=company_logo" if $callback =~ /^(\.\/)?$/;
+ $form->{callback} = $callback;
print $form->parse_html_template("menu/menunew");
}
print $form->parse_html_template("menu/menunew");
}
@@
-77,7
+81,7
@@
sub clock_line {
}
sub acc_menu {
}
sub acc_menu {
- $locale = Locale->new($
language
, "menu");
+ $locale = Locale->new($
myconfig{countrycode}
, "menu");
my $mainlevel = $form->{level};
$mainlevel =~ s/\Q$mainlevel\E--//g;
my $mainlevel = $form->{level};
$mainlevel =~ s/\Q$mainlevel\E--//g;