projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git@lx-office.linet-services.de:lx-office-erp
[kivitendo-erp.git]
/
SL
/
Form.pm
diff --git
a/SL/Form.pm
b/SL/Form.pm
index
0637e6e
..
6e7145f
100644
(file)
--- a/
SL/Form.pm
+++ b/
SL/Form.pm
@@
-385,7
+385,7
@@
sub escape {
my ($self, $str) = @_;
$str = Encode::encode('utf-8-strict', $str) if $::locale->is_utf8;
my ($self, $str) = @_;
$str = Encode::encode('utf-8-strict', $str) if $::locale->is_utf8;
- $str =~ s/([^a-zA-Z0-9_.-])/sprintf("%%%02x", ord($1))/ge;
+ $str =~ s/([^a-zA-Z0-9_.
:
-])/sprintf("%%%02x", ord($1))/ge;
$main::lxdebug->leave_sub(2);
$main::lxdebug->leave_sub(2);
@@
-401,6
+401,7
@@
sub unescape {
$str =~ s/\\$//;
$str =~ s/%([0-9a-fA-Z]{2})/pack("c",hex($1))/eg;
$str =~ s/\\$//;
$str =~ s/%([0-9a-fA-Z]{2})/pack("c",hex($1))/eg;
+ $str = Encode::decode('utf-8-strict', $str) if $::locale->is_utf8;
$main::lxdebug->leave_sub(2);
$main::lxdebug->leave_sub(2);
@@
-1616,7
+1617,7
@@
sub get_standard_dbh {
undef $standard_dbh;
}
undef $standard_dbh;
}
- $standard_dbh ||=
SL::DB::create->dbh
;
+ $standard_dbh ||=
$self->dbconnect_noauto($myconfig)
;
$main::lxdebug->leave_sub(2);
$main::lxdebug->leave_sub(2);