--- /usr/share/perl5/TWiki.pm 2004-01-17 18:05:22.000000000 +0100
+++ lib/TWiki.pm 2004-02-27 19:17:36.000000000 +0100
@@ -75,2 +75,5 @@
+use vars qw( $dispScriptUrlPath
+ $dispViewPath );
+
# ===========================
@@ -1102,3 +1105,3 @@
# see also Codev.PageRedirectionNotWorking
- return "$urlHost$scriptUrlPath/view$scriptSuffix/$web/$theTopic";
+ return "$urlHost$dispScriptUrlPath$dispViewPath/$web/$theTopic";
}
@@ -1110,3 +1113,3 @@
- my $url = "$urlHost$scriptUrlPath/$theScript$scriptSuffix/$theWeb/$theTopic";
+ my $url = "$urlHost$dispScriptUrlPath/$theScript$scriptSuffix/$theWeb/$theTopic";
@@ -1651,3 +1654,9 @@
# create linked bullet item
- $line = "$tabs* $line";
+ # AB change
+ # $line = "$tabs* $line";
+ if ( $viewScript eq 'view' ) {
+ $line = "$tabs* $line";
+ } else {
+ $line = "$tabs* $line";
+ }
$result .= "\n$line";
@@ -1811,3 +1820,3 @@
# Make Edit URL unique for every edit - fix for RefreshEditPage
- $_[0] =~ s!%EDITURL%!"$scriptUrlPath/edit$scriptSuffix/%URLENCODE{\"%WEB%/%TOPIC%\"}%\?t=" . time()!ge;
+ $_[0] =~ s!%EDITURL%!"$dispScriptUrlPath/edit$scriptSuffix/%URLENCODE{\"%WEB%/%TOPIC%\"}%\?t=" . time()!ge;
@@ -1838,4 +1847,4 @@
$_[0] =~ s/%WIKIHOMEURL%/$wikiHomeUrl/g;
- $_[0] =~ s/%SCRIPTURL%/$urlHost$scriptUrlPath/g;
- $_[0] =~ s/%SCRIPTURLPATH%/$scriptUrlPath/g;
+ $_[0] =~ s/%SCRIPTURL%/$urlHost$dispScriptUrlPath/g;
+ $_[0] =~ s/%SCRIPTURLPATH%/$dispScriptUrlPath/g;
$_[0] =~ s/%SCRIPTSUFFIX%/$scriptSuffix/g;
@@ -2109,3 +2118,3 @@
$putBack = " - put it back";
@@ -2376,3 +2385,3 @@
my $anchor = makeAnchorName( $theAnchor );
- $text .= "$theLinkText<\/a>";
@@ -2380,3 +2389,3 @@
} else {
- $text .= "$theLinkText<\/a>";
@@ -2388,3 +2397,3 @@
. "$theLinkText"
- . "?";
+ . "?";
return $text;