[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.1-228-gb3b5015

[Shawn Moore]

The branch, 4.4-trunk has been updated
       via  b3b50155d29b02dd86b5ecabe93bb9117a5e580c (commit)
       via  f76ce07069eec4528ff2d1eed1d6f5744bcf0843 (commit)
      from  b23fd9c987564df2d7b6643b4cbd4492fdcbdae6 (commit)

Summary of changes:
 lib/RT/Config.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit f76ce07069eec4528ff2d1eed1d6f5744bcf0843
Author: Dominic Hargreaves <dom at earth.li>
Date:   Mon Jan 2 23:15:57 2017 +0000

    Also search in $RT::LocalEtcPath for RT_SiteConfig.d includes
    
    This matches the dual-loading of RT_SiteConfig.pm and is needed for Debian.

diff --git a/lib/RT/Config.pm b/lib/RT/Config.pm
index 3407796..ebf739c 100644
--- a/lib/RT/Config.pm
+++ b/lib/RT/Config.pm
@@ -1241,7 +1241,8 @@ sub LoadConfig {
         delete $INC{$load};
 
         my $dir = $ENV{RT_SITE_CONFIG_DIR} || "$RT::EtcPath/RT_SiteConfig.d";
-        for my $file ( sort <$dir/*.pm> ) {
+        my $localdir = $ENV{RT_SITE_CONFIG_DIR} || "$RT::LocalEtcPath/RT_SiteConfig.d";
+        for my $file ( sort(<$dir/*.pm>), sort(<$localdir/*.pm>) ) {
             $self->_LoadConfig( %args, File => $file, Site => 1, Extension => '' );
             delete $INC{$file};
         }

commit b3b50155d29b02dd86b5ecabe93bb9117a5e580c
Merge: b23fd9c f76ce07
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Tue Jan 10 10:31:30 2017 -0500

    Merge branch 'local-siteconfig-include' into 4.4-trunk


-----------------------------------------------------------------------