Changeset 9623

Timestamp:

10/19/10 17:52:04 (3 years ago)

Author:

KennethLavrsen

Message:

Item9844: Merge feature no longer working
Fix provided by Crawford Currie. Checked by me after successful testing

File:

• trunk/core/lib/Foswiki/UI/Edit.pm (modified) (1 diff)

trunk/core/lib/Foswiki/UI/Edit.pm

@@ -63 +63 @@
     my $parentTopic = $query->param('topicparent') || '';
     my $ptext       = $query->param('text');
-    my $revision    = Foswiki::Store::cleanUpRevID( $query->param('rev') );
+    my $revision    = $query->param('rev');
+    $revision = Foswiki::Store::cleanUpRevID($revision) if defined $revision;
 
     Foswiki::UI::checkWebExists( $session, $web, 'edit' );