Item14195: Prevent loop in UI/View under some conditions

foswiki · Sep 18, 2016 · 28fd71f · 28fd71f
1 parent a20b737
commit 28fd71f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/core/lib/Foswiki/UI/View.pm b/core/lib/Foswiki/UI/View.pm
@@ -308,9 +308,11 @@ sub view {
     }
 
     # Show revisions around the one being displayed.
-    $tmpl =~ s/%REVISIONS%/
+    if ( index( $tmpl, '%REVISIONS%' ) >= 0 ) {
+        $tmpl =~ s/%REVISIONS%/
       revisionsAround(
           $session, $topicObject, $requestedRev, $showRev, $maxRev)/e;
+    }
 
     ## SMELL: This is also used in Foswiki::_TOC. Could insert a tag in
     ## TOC and remove all those here, finding the parameters only once
@@ -514,7 +516,7 @@ sub revisionsAround {
         my $showIndex = $#revs;
         my $left      = 0;
         my $right     = $Foswiki::cfg{NumberOfRevisions};
-        if ($requestedRev) {
+        if ( $requestedRev && $showIndex >= 0 ) {
             while ( $showIndex && $revs[$showIndex] != $showRev ) {
                 $showIndex--;
             }