Item13899: Make sure text param is processed

foswiki · Dec 25, 2015 · cb452f8 · cb452f8
1 parent 20f6d8e
commit cb452f8
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/core/lib/Foswiki/UI/Save.pm b/core/lib/Foswiki/UI/Save.pm
@@ -177,17 +177,20 @@ sub buildNewTopic {
         $ancestorRev = 0;
     }
 
-    $text = $query->param('text') if scalar $query->param('text');
-    if ( defined $text ) {
+    # $text now contains either text from an existing topic.
+    # or text obtained from a template topic. Now determine if
+    # the query params will override it.
+    if ( defined $query->param('text') ) {
 
         # text is defined in the query, save that text, overriding anything
         # from the template or the previous rev of the topic
+        $text = $query->param('text');
         $text =~ s/\r//g;
         $text .= "\n" unless $text =~ m/\n$/s;
     }
-    else {
-        $text = '';
-    }
+
+    # Make sure that text is defined.
+    $text = '' unless defined $text;
 
     # Change the parent, if appropriate
     my $newParent = $query->param('topicparent');