Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
every_upload always returns an array reference
  • Loading branch information
kraih committed Oct 8, 2014
1 parent ae135de commit 107a516
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
8 changes: 4 additions & 4 deletions lib/Mojo/Parameters.pm
Expand Up @@ -56,11 +56,12 @@ sub param {
# Multiple names
return map { $self->param($_) } @$name if ref $name eq 'ARRAY';

# Last value
return $self->_param($name)->[-1] unless @_;

# Replace values
$self->remove($name) if defined $_[0];
return $self->append($name => ref $_[0] eq 'ARRAY' ? $_[0] : [@_]) if @_;

return $self->_param($name)->[-1];
return $self->append($name => ref $_[0] eq 'ARRAY' ? $_[0] : [@_]);
}

sub params {
Expand Down Expand Up @@ -173,7 +174,6 @@ sub to_string {
sub _param {
my ($self, $name) = @_;

# List values
my @values;
my $params = $self->params;
for (my $i = 0; $i < @$params; $i += 2) {
Expand Down
10 changes: 4 additions & 6 deletions lib/Mojolicious/Controller.pm
Expand Up @@ -365,12 +365,10 @@ sub _param {
return ref $value eq 'ARRAY' ? $value : [$value];
}

# Uploads
my $req = $self->req;
if (my $uploads = $req->every_upload($name)) { return $uploads if @$uploads }

# Param values
return $req->every_param($name);
# Uploads or param values
my $req = $self->req;
my $uploads = $req->every_upload($name);
return @$uploads ? $uploads : $req->every_param($name);
}

sub _signed_cookie {
Expand Down

0 comments on commit 107a516

Please sign in to comment.