[Rt-commit] r19944 - in rt/3.999/trunk: lib

[sartak at bestpractical.com]

Author: sartak
Date: Mon Jun  8 14:05:59 2009
New Revision: 19944

Modified:
   rt/3.999/trunk/lib/RT.pm
   rt/3.999/trunk/t/plugin.t

Log:
Remove $RT::LocalLibPath

Modified: rt/3.999/trunk/lib/RT.pm
==============================================================================
--- rt/3.999/trunk/lib/RT.pm	(original)
+++ rt/3.999/trunk/lib/RT.pm	Mon Jun  8 14:05:59 2009
@@ -66,7 +66,6 @@
 our $SbinPath          = $BASE_PATH . '/sbin';
 our $VarPath          = $BASE_PATH . '/var';
 our $LocalPath        = $BASE_PATH . '/local';
-our $LocalLibPath     = $BASE_PATH . '/local/lib';
 our $LocalPluginPath  = $LocalPath . "/plugins";
 
 =head1 NAME
@@ -287,8 +286,9 @@
     my @lib_dirs = $self->plugin_dirs('lib');
 
     my @tmp_inc;
+    my $local_lib = Jifty::Util->app_root . '/local/lib';
     for (@INC) {
-        if ( Cwd::realpath($_) eq $RT::LocalLibPath) {
+        if ( Cwd::realpath($_) eq $local_lib) {
             push @tmp_inc, $_, @lib_dirs;
         } else {
             push @tmp_inc, $_;

Modified: rt/3.999/trunk/t/plugin.t
==============================================================================
--- rt/3.999/trunk/t/plugin.t	(original)
+++ rt/3.999/trunk/t/plugin.t	Mon Jun  8 14:05:59 2009
@@ -17,7 +17,8 @@
 
 BEGIN {
     use RT;
-    use lib $RT::LocalLibPath; # plugin need this path in @INC
+    my $local_lib = Jifty::Util->app_root . '/local/lib';
+    use lib $local_lib; # plugin need this path in @INC
     RT->load_config;
     $RT::LocalPluginPath = $RT::BASE_PATH . "/t/plugins";
     RT->config->set( 'plugins', 'RT::Extension::Test' );