From: Sebastian Riedel <sri@labs.kraih.com>
Date: Sat, 7 Jan 2006 02:26:36 +0000 (+0000)
Subject: Added MyApp->config->{file}
X-Git-Tag: 5.7099_04~758
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=909259b5bb9fe0123a5bc485fc77accd0e289020

Added MyApp->config->{file}
---

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index c5c315e..6735051 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 $confpath =
-      $class->path_to(
-        Catalyst::Utils::appprefix( ref $class || $class ) . '.yml' );
-    my $conf = {};
+    my $conffile = $class->config->{file}
+      || ( Catalyst::Utils::appprefix( ref $class || $class ) . '.yml' );
+    my $confpath = $class->path_to($conffile);
+    my $conf     = {};
     $conf = YAML::LoadFile($confpath) if -f $confpath;
     my $oldconf = $class->config;
     $class->config( { %$oldconf, %$conf } );