[Rt-commit] r15023 - in rt/3.8/branches/3.8.1-releng: lib

[falcone at bestpractical.com]

Author: falcone
Date: Mon Aug 11 21:00:26 2008
New Revision: 15023

Modified:
   rt/3.8/branches/3.8.1-releng/   (props changed)
   rt/3.8/branches/3.8.1-releng/lib/RT.pm.in

Log:
- Merge //mirror/bps-public/rt/3.8/trunk to //mirror/bps-public/rt/3.8/branches/3.8.1-releng

Modified: rt/3.8/branches/3.8.1-releng/lib/RT.pm.in
==============================================================================
--- rt/3.8/branches/3.8.1-releng/lib/RT.pm.in	(original)
+++ rt/3.8/branches/3.8.1-releng/lib/RT.pm.in	Mon Aug 11 21:00:26 2008
@@ -593,13 +593,9 @@
 
 =cut
 
-{
-my $PluginPathsInited = 0;
 sub InitPluginPaths {
     my $self = shift || __PACKAGE__;
 
-    return @INC if $PluginPathsInited;
-
     my @lib_dirs = $self->PluginDirs('lib');
 
     my @tmp_inc;
@@ -610,9 +606,8 @@
             push @tmp_inc, $_;
         }
     }
-    $PluginPathsInited = 1;
-    @INC = @tmp_inc;
-}
+    my %seen;
+    @INC = grep !$seen{$_}++, @tmp_inc;
 }
 
 =head2 InitPlugins