X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMoreCommon.pm;h=1aa9c2d4ca50e6cc71a416adb4c0ab521d9b559c;hb=9a8ec1f0d7a7652498258ecb469cbc2d89ad945f;hp=dfc5a7d8002d63c7aa637efab70fc25f07b09824;hpb=6061749dc0ece2873ef61a0c14af1b8a9e46034a;p=kivitendo-erp.git diff --git a/SL/MoreCommon.pm b/SL/MoreCommon.pm index dfc5a7d80..1aa9c2d4c 100644 --- a/SL/MoreCommon.pm +++ b/SL/MoreCommon.pm @@ -3,7 +3,7 @@ package SL::MoreCommon; require Exporter; our @ISA = qw(Exporter); -our @EXPORT = qw(save_form restore_form compare_numbers any cross); +our @EXPORT = qw(save_form restore_form compare_numbers cross); our @EXPORT_OK = qw(ary_union ary_intersect ary_diff listify ary_to_hash uri_encode uri_decode); use List::MoreUtils qw(zip); @@ -76,15 +76,6 @@ sub compare_numbers { return $a <=> $b; } -sub any (&@) { - my $f = shift; - return if ! @_; - for (@_) { - return 1 if $f->(); - } - return 0; -} - sub cross(&\@\@) { my $op = shift; use vars qw/@A @B/; @@ -164,7 +155,7 @@ sub ary_to_hash { sub uri_encode { my ($str) = @_; - $str = Encode::encode('utf-8-strict', $str) if $::locale->is_utf8; + $str = Encode::encode('utf-8-strict', $str); $str =~ s/([^a-zA-Z0-9_.:-])/sprintf("%%%02x", ord($1))/ge; return $str; @@ -177,7 +168,7 @@ sub uri_decode { $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; + $str = Encode::decode('utf-8-strict', $str); return $str; }