[Rt-commit] r17784 - rt/3.8/trunk/lib/RT

[ruz at bestpractical.com]

Author: ruz
Date: Fri Jan 16 09:45:35 2009
New Revision: 17784

Modified:
   rt/3.8/trunk/lib/RT/Config.pm

Log:
* prepare for refactoring

Modified: rt/3.8/trunk/lib/RT/Config.pm
==============================================================================
--- rt/3.8/trunk/lib/RT/Config.pm	(original)
+++ rt/3.8/trunk/lib/RT/Config.pm	Fri Jan 16 09:45:35 2009
@@ -666,7 +666,11 @@
         $type = $META{$name}->{'Type'} || 'SCALAR';
     }
 
-    return 1 if exists $OPTIONS{$name} && !$args{'SiteConfig'};
+    # if option is already set we have to check where
+    # it comes from and may be ignore it
+    if ( exists $OPTIONS{$name} ) {
+        return 1 if !$args{'SiteConfig'};
+    }
 
     $META{$name}->{'Type'} = $type;
     foreach (qw(Package File Line SiteConfig Extension)) {