merging RT 4.0.6

[freeside.git] / rt / lib / RT / Installer.pm

diff --git a/rt/lib/RT/Installer.pm b/rt/lib/RT/Installer.pm
index 3976ade..d12abb6 100644 (file)
--- a/rt/lib/RT/Installer.pm
+++ b/rt/lib/RT/Installer.pm
@@ -252,7 +252,7 @@ sub CurrentValues {
 
 sub ConfigFile {
     require File::Spec;
-    return File::Spec->catfile( $RT::EtcPath, 'RT_SiteConfig.pm' );
+    return $ENV{RT_SITE_CONFIG} || File::Spec->catfile( $RT::EtcPath, 'RT_SiteConfig.pm' );
 }
 
 sub SaveConfig {