[TWiki-Dev] [SVN] HaraldJoerg r30319 - twiki/trunk/BackupRestorePlugin/bin

[<de...@de...>]

Author: HaraldJoerg
Date: 2017-04-07 19:04:39 +0000 (Fri, 07 Apr 2017)
New Revision: 30319
Trac url: http://develop.twiki.org/trac/changeset/30319

Modified:
   twiki/trunk/BackupRestorePlugin/bin/backuprestore
Log:
Item7796: Activate TWiki's lib directories before using CGI::Carp (BackupRestorePlugin)

Modified: twiki/trunk/BackupRestorePlugin/bin/backuprestore
===================================================================
--- twiki/trunk/BackupRestorePlugin/bin/backuprestore	2017-04-07 18:33:47 UTC (rev 30318)
+++ twiki/trunk/BackupRestorePlugin/bin/backuprestore	2017-04-07 19:04:39 UTC (rev 30319)
@@ -26,17 +26,17 @@
 my $params;
 
 BEGIN {
+    @INC = ('.', grep { $_ ne '.' } @INC);
+    require 'setlib.cfg';
     if ( ( $ENV{GATEWAY_INTERFACE} || $ENV{MOD_PERL} ) && ! $ARGV[0] ) {
         $cfg->{ScriptType} = 'cgi';
-        use CGI::Carp qw(fatalsToBrowser);
+        require CGI::Carp; CGI::Carp->import(qw(fatalsToBrowser));
         $SIG{__DIE__} = \&CGI::Carp::confess;
     } else {
         $cfg->{ScriptType} = 'cli';
         require Carp;
         $SIG{__DIE__} = \&Carp::confess;
     }
-    @INC = ('.', grep { $_ ne '.' } @INC);
-    require 'setlib.cfg';
     do 'LocalSite.cfg';
 }