[Rt-commit] r7186 - rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT

[ruz at bestpractical.com]

Author: ruz
Date: Wed Mar  7 19:40:50 2007
New Revision: 7186

Modified:
   rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Config.pm

Log:
* use RT_SITE_CONFIG env variable only when we're loading RT_SiteConfig.pm

Modified: rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Config.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Config.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL-TUNIS/lib/RT/Config.pm	Wed Mar  7 19:40:50 2007
@@ -188,7 +188,7 @@
     my $self = shift;
     my %args = (File => '', @_);
     $args{'File'} =~ s/(?<!Site)(?=Config\.pm$)/Site/;
-    if (my $site_config = $ENV{RT_SITE_CONFIG}) {
+    if ($args{'File'} eq 'RT_SiteConfig.pm' and my $site_config = $ENV{RT_SITE_CONFIG}) {
         $self->_LoadConfig( %args, File => $site_config );
     }
     else {
@@ -264,8 +264,8 @@
 
 =head2 Configs
 
-Returns list of the configs file names.
-F<RT_Config.pm> is always first, other configs are ordered by name.
+Returns list of the top level configs file names. F<RT_Config.pm> is always
+first, other configs are ordered by name.
 
 =cut