--- perl-5.10.0.orig/lib/CGI.pm	2007/12/18 19:47:07	1.1
+++ perl-5.10.0/lib/CGI.pm	2010/05/28 06:01:04
@@ -449,8 +449,8 @@
     my $utf8    = $charset eq 'utf-8';
     if ($utf8) {
       eval "require Encode; 1;" if $utf8 && !Encode->can('decode'); # bring in these functions
-      return wantarray ? map {Encode::decode(utf8=>$_) } @{$self->{$name}} 
-                       : Encode::decode(utf8=>$self->{$name}->[0]);
+      my @result = map {ref($_) ? $_ : Encode::decode(utf8=>$_) } @{$self->{$name}};
+      return wantarray ? @result: $result[0];
     } else {
       return wantarray ? @{$self->{$name}} : $self->{$name}->[0];
     }