Changeset 14270 for gsdl/branches/gsdl-2.74/perllib/plugin.pm

Timestamp:

2007-07-25T13:37:52+12:00 (17 years ago)

Author:

oranfry

Message:

merged selected changes to the gsdl trunk since r14217 into the 2.74 branch

File:

• gsdl/branches/gsdl-2.74/perllib/plugin.pm (modified) (1 diff)

gsdl/branches/gsdl-2.74/perllib/plugin.pm

@@ -48 +48 @@
 
     # find the plugin
-    my $customplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'}, 
+    my $customplugname;
+    if (defined($ENV{'GSDLCOLLECTION'}))
+    {
+    $customplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "custom", $ENV{'GSDLCOLLECTION'}, 
                                              'perllib', 'plugins', "${pluginname}.pm");
+    }
     my $colplugname = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, 'perllib', 'plugins', 
                       "${pluginname}.pm");
     my $mainplugname = &util::filename_cat($ENV{'GSDLHOME'}, 'perllib', 'plugins', 
                        "${pluginname}.pm");
-    if (-e $customplugname) { require $customplugname; }
+    if (defined($customplugname) && -e $customplugname) { require $customplugname; }
     elsif (-e $colplugname) { require $colplugname; }
     elsif (-e $mainplugname) { require $mainplugname; }