Skip to content

Commit

Permalink
Item9269: fixing FORMFIELD's way of using standard escapes ... applie…
Browse files Browse the repository at this point in the history
…s to trunk as well as 1.0.9

git-svn-id: http://svn.foswiki.org/trunk@8051 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
MichaelDaum authored and MichaelDaum committed Jul 7, 2010
1 parent 75ebfc9 commit ddcc6de
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions core/lib/Foswiki/Render.pm
Expand Up @@ -923,7 +923,7 @@ sub renderFORMFIELD {
$formTopicObject;
}

my $text = Foswiki::expandStandardEscapes($format);
my $text = $format;
my $found = 0;
my $title = '';
my @fields = $formTopicObject->find('FIELD');
Expand Down Expand Up @@ -955,6 +955,8 @@ sub renderFORMFIELD {
$text = $altText || '';
}

$text = Foswiki::expandStandardEscapes($text);

# render nop exclamation marks before words as <nop>
$text =~ s/!(\w+)/<nop>$1/gs;

Expand Down Expand Up @@ -1166,7 +1168,7 @@ sub getRenderedVersion {
# Lists and paragraphs
if ( $line =~ m/^\s*$/ ) {
unless ( $tableRow || $isFirst ) {
$line = '<p />';
$line = '<p />'; # SMELL: should be <p></p>
}
$isList = 0;
}
Expand Down

0 comments on commit ddcc6de

Please sign in to comment.