Item12466: A_VALUE needs to expand to mapped value

git-svn-id: http://svn.foswiki.org/branches/Release01x01@16677 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Apr 23, 2013 · e48c85a · e48c85a
1 parent 9a42351
commit e48c85a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/core/lib/Foswiki/Form.pm b/core/lib/Foswiki/Form.pm
@@ -615,7 +615,11 @@ sub renderForDisplay {
             # Legacy; was %A_TITLE% before it was $title
             $row =~ s/%A_TITLE%/\$title/g;
             $row =~ s/%A_VALUE%/\$value/g;    # Legacy
-            $text .= $fieldDef->renderForDisplay( $row, $fm->{value} );
+
+            # display => 1 gets mapped values (rather than raw)
+            $text .=
+              $fieldDef->renderForDisplay( $row, $fm->{value},
+                { display => 1 } );
         }
     }
     return '' if $hasAllFieldsHidden;

diff --git a/core/lib/Foswiki/Render.pm b/core/lib/Foswiki/Render.pm
@@ -1059,6 +1059,8 @@ sub renderFORMFIELD {
             my $value = $field->{value};
             $text = $default if !length($value);
             $text =~ s/\$title/$title/go;
+
+            # raw field value
             $text =~ s/\$value/$value/go;
             $text =~ s/\$name/$name/g;
             if ( $text =~ m/\$form/ ) {