Item15023: bring back rev to FORMFIELD

regression due to last patch
foswiki · May 7, 2021 · 94965a1 · 94965a1
1 parent c325903
commit 94965a1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/core/lib/Foswiki/Macros/FORMFIELD.pm b/core/lib/Foswiki/Macros/FORMFIELD.pm
@@ -60,7 +60,15 @@ sub FORMFIELD {
         $format = '$value';
     }
 
-    unless ( $topicObject->latestIsLoaded() ) {
+    if ( defined $rev && length($rev) ) {
+        my $crev = $topicObject->getLoadedRev();
+        if ( defined $crev && $crev != $rev ) {
+            $topicObject =
+              Foswiki::Meta->load( $topicObject->session, $topicObject->web,
+                $topicObject->topic, $rev );
+        }
+    }
+    elsif ( !$topicObject->latestIsLoaded() ) {
 
         # load latest rev
         $topicObject =

diff --git a/core/lib/Foswiki/Macros/QUERY.pm b/core/lib/Foswiki/Macros/QUERY.pm
@@ -30,7 +30,6 @@ sub QUERY {
 
         my $rev = $params->{rev};
 
-       # FORMFIELD does its own caching.
        # Either the home-made cache there should go into Meta so that both
        # FORMFIELD and QUERY benefit, or the store should be made a lot smarter.