[TWiki-Dev] [SVN] SvenDowideit r16929 - twiki/trunk/GetAWebAddOn/bin

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

Author: SvenDowideit
Date: 2008-06-24 23:25:16 -0500 (Tue, 24 Jun 2008)
New Revision: 16929
Trac url: http://develop.twiki.org/trac/changeset/16929

Modified:
   twiki/trunk/GetAWebAddOn/bin/get-a-web
Log:
Item5734: fix GetAWebAddon for twiki 4.2

Modified: twiki/trunk/GetAWebAddOn/bin/get-a-web
===================================================================
--- twiki/trunk/GetAWebAddOn/bin/get-a-web	2008-06-24 16:08:34 UTC (rev 16928)
+++ twiki/trunk/GetAWebAddOn/bin/get-a-web	2008-06-25 04:25:16 UTC (rev 16929)
@@ -46,9 +46,18 @@
     ($webName = $query->path_info()) =~ s|^/?(.*?)[\/\.](.*)\.(tar)$|$1|;
     my $saveasweb = $query->param('saveasweb' ) || $webName;
 
-    my $dataDir = $TWiki::cfg{DataDir} || $TWiki::dataDir;
-    my $pubDir = $TWiki::cfg{PubDir} || $TWiki::pubDir;
-    my $templateDir = $TWiki::cfg{TemplateDir} || $TWiki::templateDir;
+    my $dataDir;
+    my $pubDir;
+    my $templateDir;
+    if (defined(%TWiki::cfg)) {
+        $dataDir = $TWiki::cfg{DataDir};
+        $pubDir = $TWiki::cfg{PubDir};
+        $templateDir = $TWiki::cfg{TemplateDir};
+    }
+    #pre configure settings
+    $dataDir = $TWiki::dataDir if (!defined($dataDir) && defined($TWiki::dataDir));
+    $pubDir = $TWiki::pubDir if (!defined($pubDir) && defined($TWiki::pubDir));
+    $templateDir = $TWiki::templateDir if (!defined($templateDir) && defined($TWiki::templateDir));
 
     $error .= qq{web "$webName" doesn't exist<br/>} unless TWiki::Func::webExists( $webName );
     $error .= qq{data dir "$dataDir" doesn't exist<br/>} unless -d $dataDir;