[interchange-cvs] interchange - racke modified dist/lib/UI/usertag/regenerate.tag

interchange-core@interchange.redhat.com interchange-core@interchange.redhat.com
Sun Oct 7 09:57:01 2001


User:      racke
Date:      2001-10-07 13:56:07 GMT
Modified:  dist/lib/UI/usertag Tag: STABLE_4_8-branch regenerate.tag
Log:
merged changes 2.2 vs 2.3

Revision  Changes    Path
No                   revision



No                   revision



2.0.2.2   +3 -2      interchange/dist/lib/UI/usertag/regenerate.tag


rev 2.0.2.2, prev_rev 2.0.2.1
Index: regenerate.tag
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/usertag/regenerate.tag,v
retrieving revision 2.0.2.1
retrieving revision 2.0.2.2
diff -u -r2.0.2.1 -r2.0.2.2
--- regenerate.tag	2001/10/05 16:19:54	2.0.2.1
+++ regenerate.tag	2001/10/07 13:56:07	2.0.2.2
@@ -213,14 +213,15 @@
 	::response("\n\n        Generating....\n");
 	# we need to restore some settings from the original configuration
 	# for static page building first
-	my @confsafe = ('ImageDir', 'ImageDirSecure');
+	my @confsafe = ('ImageDir', 'ImageDirSecure', 'VendURL');
 	my %safehash;
 	for (@confsafe) {$safehash{$_} = $Vend::Cfg->{$_}}
 	$Vend::Cfg->{ImageDir} = $Vend::Cfg->{ImageDirOriginal}; 
 	$Vend::Cfg->{ImageDirSecure} = $Vend::Cfg->{ImageDirSecureOriginal}; 
+	$Vend::Cfg->{VendURL} = $Vend::Cfg->{VendURLOriginal}; 
 
 	my $umask = umask(022);
-	my $statpath = $Vend::Cfg->{StaticPath};
+	my $statpath = 'http://' . $::Variable->{SERVER_NAME} . $Vend::Cfg->{StaticPath};
 	my @bad;
 	my $base = $Vend::Cfg->{StaticDir};
 	eval {