CGI::Ex 2.22

[chaz/p5-CGI-Ex] / lib / CGI / Ex / App.pm

diff --git a/lib/CGI/Ex/App.pm b/lib/CGI/Ex/App.pm
index da5904f55a0f5a3705bc4bc4c7186ac0dcceafa0..d03f90a79c62cdb7d7a14589fad93668bb7e488d 100644 (file)
--- a/lib/CGI/Ex/App.pm
+++ b/lib/CGI/Ex/App.pm
@@ -13,7 +13,7 @@ BEGIN {
     eval { use Scalar::Util };
 }
 
-our $VERSION = '2.19';
+our $VERSION = '2.22';
 
 sub new {
     my $class = shift || croak "Usage: ".__PACKAGE__."->new";
@@ -247,9 +247,9 @@ sub prepared_print {
     my $self = shift;
     my $step = shift;
 
+    my $hash_form = $self->run_hook('hash_form',   $step) || {};
     my $hash_base = $self->run_hook('hash_base',   $step) || {};
     my $hash_comm = $self->run_hook('hash_common', $step) || {};
-    my $hash_form = $self->run_hook('hash_form',   $step) || {};
     my $hash_fill = $self->run_hook('hash_fill',   $step) || {};
     my $hash_swap = $self->run_hook('hash_swap',   $step) || {};
     my $hash_errs = $self->run_hook('hash_errors', $step) || {};
@@ -374,7 +374,7 @@ sub conf {
     return $self->{'conf'} ||= do {
         my $conf = $self->conf_file;
         if (! ref $conf) {
-            $conf = $self->conf_obj->read($conf, {no_warn_on_fail => 1}) || $self->conf_die_on_fail ? croak $@ : {};
+            $conf = $self->conf_obj->read($conf, {no_warn_on_fail => 1}) || ($self->conf_die_on_fail ? croak $@ : {});
         }
         my $hash = $self->conf_validation;
         if ($hash && scalar keys %$hash) {
@@ -650,7 +650,6 @@ sub step_by_path_index {
     my $i    = shift || 0;
     my $ref  = $self->path;
     return '' if $i < 0;
-#    return $self->default_step if $i > $#$ref;
     return $ref->[$i];
 }