Development

Changeset 3491

You must first sign up to be able to contribute.

Changeset 3491

Show
Ignore:
Timestamp:
02/18/07 10:07:59 (2 years ago)
Author:
fabien
Message:

fixed FormHelper?: textarea_tag does not escape passed value (closes #1444)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.0/lib/helper/FormHelper.php

    r3294 r3491  
    459459  } 
    460460 
    461   return content_tag('textarea', (is_object($content)) ? $content->__toString() : $content, array_merge(array('name' => $name, 'id' => get_id_from_name(_get_option($options, 'id', $name), null)), _convert_options($options))); 
     461  return content_tag('textarea', escape_once((is_object($content)) ? $content->__toString() : $content), array_merge(array('name' => $name, 'id' => get_id_from_name(_get_option($options, 'id', $name), null)), _convert_options($options))); 
    462462} 
    463463 

  • branches/1.0/test/unit/helper/FormHelperTest.php

    r3279 r3491  
    9494} 
    9595 
    96 $t = new lime_test(83, new lime_output_color()); 
     96$t = new lime_test(85, new lime_output_color()); 
    9797 
    9898$context = sfContext::getInstance(); 
    …… 
    189189$t->is(textarea_tag('name'), '<textarea name="name" id="name"></textarea>', 'textarea_tag() takes a name as its first argument'); 
    190190$t->is(textarea_tag('name', 'content'), '<textarea name="name" id="name">content</textarea>', 'textarea_tag() takes a value as its second argument'); 
     191$t->is(textarea_tag('name', '<p>foo</p>'), '<textarea name="name" id="name">&lt;p&gt;foo&lt;/p&gt;</textarea>', 'textarea_tag() escapes the content'); 
     192$t->is(textarea_tag('name', '&lt;p&gt;foo&lt;/p&gt;'), '<textarea name="name" id="name">&lt;p&gt;foo&lt;/p&gt;</textarea>', 'textarea_tag() does not escape an already escaped content'); 
    191193 
    192194// options