Item9844: Merge feature no longer working

Fix provided by Crawford Currie. Checked by me after successful testing git-svn-id: http://svn.foswiki.org/branches/Release01x01@9622 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Oct 19, 2010 · 1ed0104 · 1ed0104
1 parent aa0badb
commit 1ed0104
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/lib/Foswiki/UI/Edit.pm b/core/lib/Foswiki/UI/Edit.pm
@@ -62,7 +62,8 @@ sub init_edit {
       || 'text/html';
     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' );