[Rt-commit] r4418 - in rt/branches/3.7-EXPERIMENTAL: .

[ruz at bestpractical.com]

Author: ruz
Date: Fri Jan 20 07:28:09 2006
New Revision: 4418

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Config.pm

Log:
 r1633 at cubic-pc:  cubic | 2006-01-20 05:59:49 +0300
 * correct is_ext check


Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Config.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Config.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Config.pm	Fri Jan 20 07:28:09 2006
@@ -97,7 +97,7 @@
 for all settings; it bases some values on settings from the site
 configuration file.
 
-B<Note> that core config file skips options if site config
+B<Note> that core config file don't change options if site config
 has set them so to add value to some option instead of
 overriding you have to copy original value from core config file.
 
@@ -107,7 +107,6 @@
 {
     my $self = shift;
     my %args = (File => '', @_);
-    my $config = $args{'File'};
     $args{'File'} =~ s/(?<!Site)(?=Config\.pm$)/Site/;
     $self->_LoadConfig( %args );
     $args{'File'} =~ s/Site(?=Config\.pm$)//;
@@ -120,23 +119,23 @@
     my $self = shift;
     my %args = (File => '', @_);
 
-    my ($is_site,$is_ext) = (0, 1);
-    $is_ext = 0 if $args{'File'} =~ /^RT_(?:Site)?Config$/;
-    $is_site = 1 if $args{'File'} =~ /SiteConfig/;
+    my $is_ext = $args{'File'} !~ /^RT_(?:Site)?Config/? 1: 0;
+    my $is_site = $args{'File'} =~ /SiteConfig/? 1: 0;
 
     eval {
         package RT;
         local *Set = sub(\[$@%]@) {
             my ($opt_ref, @args) = @_;
             my ($pack, $file, $line) = caller;
-            return $self->SetFromConfig( Option => $opt_ref,
-                                         Value => [@args],
-                                         Package => $pack,
-                                         File => $file,
-                                         Line => $line,
-                                         SiteConfig => $is_site,
-                                         Extension => $is_ext,
-                                       );
+            return $self->SetFromConfig(
+                Option     => $opt_ref,
+                Value      => [@args],
+                Package    => $pack,
+                File       => $file,
+                Line       => $line,
+                SiteConfig => $is_site,
+                Extension  => $is_ext,
+            );
         };
         local @INC = ($LocalEtcPath, $EtcPath);
         require $args{'File'};