From: Sebastian Riedel Date: Sat, 7 Jan 2006 02:30:12 +0000 (+0000) Subject: Updated MyApp->config->{file} X-Git-Tag: 5.7099_04~757 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=128dd1a915c7416311a8e9cc9aef79bc8c2904d4;hp=909259b5bb9fe0123a5bc485fc77accd0e289020 Updated MyApp->config->{file} --- diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 6735051..2f1083c 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -575,10 +575,10 @@ sub setup { $class->setup_home( delete $flags->{home} ); # YAML config support - my $conffile = $class->config->{file} - || ( Catalyst::Utils::appprefix( ref $class || $class ) . '.yml' ); - my $confpath = $class->path_to($conffile); - my $conf = {}; + my $confpath = $class->config->{file} + || $class->path_to( + ( Catalyst::Utils::appprefix( ref $class || $class ) . '.yml' ) ); + my $conf = {}; $conf = YAML::LoadFile($confpath) if -f $confpath; my $oldconf = $class->config; $class->config( { %$oldconf, %$conf } );