--- /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* <a href=\"$scriptUrlPath/$viewScript$scriptSuffix/$webPath/$topicname#$anchor\">$line</a>";
+                # AB change
+		# $line = "$tabs* <a href=\"$dispScriptUrlPath/$viewScript$scriptSuffix/$webPath/$topicname#$anchor\">$line</a>";
+		if ( $viewScript eq 'view' ) {
+		    $line = "$tabs* <a href=\"$dispScriptUrlPath$dispViewPath/$webPath/$topicname#$anchor\">$line</a>";
+		} else {
+		    $line = "$tabs* <a href=\"$dispScriptUrlPath/$viewScript$scriptSuffix/$webPath/$topicname#$anchor\">$line</a>";
+		}
                 $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  = " - <a title=\"Click to move topic back to previous location, with option to change references.\"";
-            $putBack .= " href=\"$scriptUrlPath/rename/$web/$topic?newweb=$fromWeb&newtopic=$fromTopic&";
+            $putBack .= " href=\"$dispScriptUrlPath/rename/$web/$topic?newweb=$fromWeb&newtopic=$fromTopic&";
             $putBack .= "confirm=on\">put it back</a>";
@@ -2376,3 +2385,3 @@
             my $anchor = makeAnchorName( $theAnchor );
-            $text .= "<a href=\"$scriptUrlPath/view$scriptSuffix/"
+            $text .= "<a href=\"$dispScriptUrlPath$dispViewPath/"
                   .  "$theWeb/$theTopic\#$anchor\">$theLinkText<\/a>";
@@ -2380,3 +2389,3 @@
         } else {
-            $text .= "<a href=\"$scriptUrlPath/view$scriptSuffix/"
+            $text .= "<a href=\"$dispScriptUrlPath$dispViewPath/"
                   .  "$theWeb/$theTopic\">$theLinkText<\/a>";
@@ -2388,3 +2397,3 @@
               .  "<font color=\"$newTopicFontColor\">$theLinkText</font></span>"
-              .  "<a href=\"$scriptUrlPath/edit$scriptSuffix/$theWeb/$theTopic?topicparent=$webName.$topicName\">?</a>";
+              .  "<a href=\"$dispScriptUrlPath/edit$scriptSuffix/$theWeb/$theTopic?topicparent=$webName.$topicName\">?</a>";
         return $text;