update branches with bugfixes from HEAD

git-svn-id: file:///home/dpavlin/private/svn/webpac/branches/hidra@458 13eb9ef6-21d5-0310-b721-a9d68796d827

diff --git a/WebPac.pm b/WebPac.pm
index c187dee..ca02296 100644 (file)
--- a/WebPac.pm
+++ b/WebPac.pm
@@ -183,7 +183,9 @@ sub make_pager_vars {
        my @persist_vars = @_;
        my $hidden_vars = '';
        foreach my $v (@persist_vars) {
-               $hidden_vars .= '<input type="hidden" name="'.$v.'" value="'.$q->param($v).'"/>'."\n";
+               foreach my $val ($q->param($v)) {
+                       $hidden_vars .= '<input type="hidden" name="'.$v.'" value="'.$val.'"/>'."\n";
+               }
        }
 
        $tmpl->param('PAGER_HIDDEN', $hidden_vars);

diff --git a/my_unac_string.pm b/my_unac_string.pm
index 3c16afa..288e716 100644 (file)
--- a/my_unac_string.pm
+++ b/my_unac_string.pm
@@ -4,7 +4,7 @@
 
 use Text::Unaccent 1.02;       # 1.01 won't compile on my platform,
 
-sub my_unac_string($$) {
+sub my_unac_string {
        my $charset = shift || return;
        my $string = shift || return;
        $string = unac_string($charset,$string);

diff --git a/parse_format.pm b/parse_format.pm
index 3f4d50d..6a9bfb8 100644 (file)
--- a/parse_format.pm
+++ b/parse_format.pm
@@ -56,7 +56,7 @@ sub parse_iso_format {
                my $f = $format;
 
                my $eval;
-               $eval = $1 if ($f =~ s/^eval{([^}]+)}//);
+               $eval = $1 if ($f =~ s/^eval{([^}]+?)}//);
 
                if ($f =~ s/^([^\d]+)//) {
                        if ($f) {       # there is more to parse