[Jifty-commit] r2352 - in jifty/trunk/lib/Jifty/Web/Form: Field

[jifty-commit at lists.jifty.org]

Author: audreyt
Date: Fri Dec  8 11:22:40 2006
New Revision: 2352

Modified:
   jifty/trunk/lib/Jifty/Web/Form/Field.pm
   jifty/trunk/lib/Jifty/Web/Form/Field/Select.pm

Log:
* Jifty::Web::Form::Field and ::Select - Label display was rendered using
  the latin1-biased escaping in HTML::Entities; switch to the proper UTF-8
  escaping in Jifty->web->escape.

Modified: jifty/trunk/lib/Jifty/Web/Form/Field.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Field.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Form/Field.pm	Fri Dec  8 11:22:40 2006
@@ -460,7 +460,7 @@
     $field .= qq! type="@{[ $self->type ]}"!;
     $field .= qq! name="@{[ $self->input_name ]}"! if ($self->input_name);
     $field .= qq! id="@{[ $self->element_id ]}"!;
-    $field .= qq! value="@{[HTML::Entities::encode_entities($self->current_value)]}"! if defined $self->current_value;
+    $field .= qq! value="@{[Jifty->web->escape($self->current_value)]}"! if defined $self->current_value;
     $field .= $self->_widget_class; 
     $field .= qq! size="@{[ $self->length() ]}" maxlength="@{[ $self->length() ]}"! if ($self->length());
     $field .= " " .$self->other_widget_properties;
@@ -518,7 +518,7 @@
     my $field = '<span';
     $field .= qq! class="@{[ $self->classes ]}"> !;
     # XXX: force stringify the value because maketext is buggy with overloaded objects.
-    $field .= HTML::Entities::encode_entities(_("@{[$self->current_value]}")) if defined $self->current_value;
+    $field .= Jifty->web->escape(_("@{[$self->current_value]}")) if defined $self->current_value;
     $field .= qq!</span>\n!;
     Jifty->web->out($field);
     return '';

Modified: jifty/trunk/lib/Jifty/Web/Form/Field/Select.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Field/Select.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Form/Field/Select.pm	Fri Dec  8 11:22:40 2006
@@ -26,7 +26,7 @@
         $field .= qq! selected="selected"!
             if defined $self->current_value and $self->current_value eq $value;
         $field .= qq!>!;
-        $field .= HTML::Entities::encode_entities(_($display)) if defined $display;
+        $field .= Jifty->web->escape(_($display)) if defined $display;
         $field .= qq!</option>\n!;
     } 
     $field .= qq!</select>\n!;
@@ -53,7 +53,7 @@
                         @{ $self->action->available_values($self->name) };
         $value = $value[0]->{display} if scalar @value;
     }
-    $field .= HTML::Entities::encode_entities(_($value)) if defined $value;
+    $field .= Jifty->web->escape(_($value)) if defined $value;
     $field .= qq!</span>\n!;
     Jifty->web->out($field);
     return '';