Changeset 13781 for trunk/core/lib/Foswiki/Meta.pm

Timestamp:

01/22/12 19:31:26 (4 months ago)

Author:

CrawfordCurrie

Message:

Item11461: no need to fake the loaded rev, as we know the new content being saved is correct for the current rev (even if it was generated internally)

File:

• trunk/core/lib/Foswiki/Meta.pm (modified) (2 diffs)

trunk/core/lib/Foswiki/Meta.pm

@@ -1877 +1877 @@
         my $pretext = $text;               # text before the handler modifies it
         my $premeta = $this->stringify();  # just the meta, no text
-        # The meta obj may not have a loaded rev yet. If anything in the
-        # beforeSaveHandlers tries to do an access check with an unloadedRev,
-        # it will attempt to load the latest which we really don't want it to do.
-        # So we mark it as NEW.
-        $this->{_loadedRev} = 'NEW' unless defined $this->{_loadedRev};
+        unless ( $this->{_loadedRev} ) {
+            # The meta obj doesn't have a loaded rev yet, and we have to block the
+            # beforeSaveHandlers from loading the topic from store. We are saving,
+            # and anything we have in $this is going to get written anyway, so we
+            # can simply mark it as "the latest".
+            # SMELL: this may not work if the beforeSaveHandler tries to use the
+            # meta obj for access control checks, so that is not recommended.
+            $this->{_loadedRev} = $this->getLatestRev();
+        }
+
         $plugins->dispatch( 'beforeSaveHandler', $text, $this->{_topic},
             $this->{_web}, $this );
-        undef $this->{_loadedRev} if $this->{_loadedRev} eq 'NEW';
 
         # If the text has changed; it may be a text or meta change, or both
@@ -1912 +1916 @@
         $signal = shift;
     };
+
+    ASSERT($newRev, $this->{loadedRev}) if DEBUG;
 
     # Semantics inherited from TWiki. See