[Rt-commit] rt branch, 4.4/siteconfig.d, repushed

[? sunnavy]

The branch 4.4/siteconfig.d was deleted and repushed:
       was 19c0a09dcf7862c69b85720df5a6ca58fbb8e485
       now f5d0dd21df0f15853bbdecf3250b4b5f988497c1

1:  b9e9f32 = 1:  b9e9f32 typo
2:  19c0a09 ! 2:  338ef65 support config files in RT_SiteConfig.d
    @@ -1,9 +1,6 @@
     Author: sunnavy <sunnavy at bestpractical.com>
     
         support config files in RT_SiteConfig.d
    -    
    -    besides, it's not necessary to append "1;" any more, which makes writing
    -    config files more easily.
     
     diff --git a/Makefile.in b/Makefile.in
     --- a/Makefile.in
    @@ -26,9 +23,9 @@
      
     +=item *
     +
    -+You can separate configs in F<RT_SiteConfig.pm> into different files(with
    -+C<.pm> suffix) in F<RT_SiteConfig.d/> now, and they will have higher priority
    -+than original F<RT_SiteConfig.pm>.
    ++You can now split settings from F<RT_SiteConfig.pm> into separate files under
    ++an F<etc/RT_SiteConfig.d/> directory. All files ending in C<.pm> will be
    ++parsed, in alphabetical order, after the main F<RT_SiteConfig.pm> is loaded.
     +
      =back
      
    @@ -60,10 +57,6 @@
     +You may also split settings into separate files under the
     +F<etc/RT_SiteConfig.d/> directory.  All files ending in C<.pm> will be parsed,
     +in alphabetical order, after F<RT_SiteConfig.pm> is loaded.
    -+
    -+If you have a lot of things to config, you can separate them into different
    -+files(with C<.pm> suffix) in F<RT_SiteConfig.d/> directory, and they will
    -+override settings in F<RT_SiteConfig.pm>.
     +
      RT extensions could also provide their config files. Extensions should
      use F<< <NAME>_Config.pm >> and F<< <NAME>_SiteConfig.pm >> names for
    @@ -107,15 +100,4 @@
              ($is_ext, $is_site) = ('', 1);
          } else {
              $is_ext = $args{'File'} =~ /^(?!RT_)(?:(.*)_)(?:Site)?Config/ ? $1 : '';
    -@@
    -         push @etc_dirs, RT->PluginDirs('etc') if $is_ext;
    -         push @etc_dirs, $RT::EtcPath, @INC;
    -         local @INC = @etc_dirs;
    --        require $args{'File'};
    -+        eval { require $args{'File'} };
    -+        if ( $@ && $@ !~ /did not return a true value/ ) {
    -+            die $@;
    -+        }
    -     };
    -     if ($@) {
    -         return 1 if $is_site && $@ =~ /^Can't locate \Q$args{File}/;
    +
-:  ------- > 3:  f5d0dd2 no need to append "1;" to config files any more