Merge branch 'master', remote-tracking branch 'me/lh867-PERL5LIB'

jayallen · Apr 2, 2011 · 09f0efc · 09f0efc
3 parents 6cb4884 + 56f4f74 + 6cb4884
commit 09f0efc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/MT.pm b/lib/MT.pm
@@ -1003,7 +1003,7 @@ sub init_config {
         }
     } ## end for my $meth (@mt_paths)
 
-    if ( my $local_lib = $cfg->PerlLocalLibPath ) {
+    if ( my $local_lib = $cfg->PERL5LIB || $cfg->PerlLocalLibPath ) {
         $local_lib = [ $local_lib ] if ! 'ARRAY' eq ref $local_lib;
         eval "use local::lib qw( @{$local_lib} )";
         return $mt->trans_error(

diff --git a/lib/MT/Core.pm b/lib/MT/Core.pm
@@ -311,7 +311,9 @@ BEGIN {
             'ImportPath'      => { default => 'import',   path => 1, },
             'PluginPath' =>
               { default => 'plugins', path => 1, type => 'ARRAY', },
-             'PerlLocalLibPath' =>
+            'PerlLocalLibPath' => # This directive is deprecated.
+              { default => undef, path => 1, type => 'ARRAY', },
+            'PERL5LIB' =>
               { default => undef, path => 1, type => 'ARRAY', },
             'EnableArchivePaths' => { default => 0, },
             'SearchTemplatePath' =>