Changeset 1656

Timestamp:

03/02/10 09:57:39 (5 months ago)

Author:

klemens

Message:

Reverted escaping changes. ullWidgets must output escape content, as sfForm is excluded from symfony output escaping

Location:

trunk

Files:

• plugins/ullCorePlugin/lib/form/widget/ullWidget.php (modified) (2 diffs)
• plugins/ullCorePlugin/lib/form/widget/ullWidgetForeignKey.php (modified) (1 diff)
• test/functional/frontend/ullFlowPlugin/ullFlowCrudTest.php (modified) (1 diff)
• test/unit/ullTableTool/ullWidgetTest.php (modified) (1 diff)

trunk/plugins/ullCorePlugin/lib/form/widget/ullWidget.php

@@ -49 +49 @@
     $value = $this->handleSuffixOption($value);
     
+    $value = esc_entities($value);
+    
     $value = $this->handleNowrapOption($value);
     
@@ -65 +67 @@
     if ($suffix = $this->getOption('suffix'))
     {
-      // removed esc_entities because it makes trouble for mailing
-//      $value = esc_entities(($suffix) ? $value . ' ' . $suffix : $value);
       $value = $value . ' ' . $suffix;
     }
+    
     return $value;
   }

trunk/plugins/ullCorePlugin/lib/form/widget/ullWidgetForeignKey.php

@@ -85 +85 @@
     }
     
+    $return = esc_entities($return);
+    
     // POPUP
     if (

trunk/test/functional/frontend/ullFlowPlugin/ullFlowCrudTest.php

@@ -155 +155 @@
   ->isRequestParameter('module', 'ullFlow')
   ->isRequestParameter('action', 'list')
-  // TODO: fails at the moment. We have to look into the escaping issue (See wiki)
   ->checkResponseElement($dgsListTT->get(1, 'subject') . ' > b > a > i', false)
 ;

trunk/test/unit/ullTableTool/ullWidgetTest.php

@@ -16 +16 @@
 $t->diag('->render()');  
   $t->is($w->render('foo', 'bar'), 'bar', 'renders the widget as HTML');
-  // Do NOT encode html entities
-//  $t->is($w->render('foo', 'SchÌßel'), 'Schüßel', 'correctly escapes umlauts');
-//  $t->is($w->render('foo', 'Welcome to <i>Italy</i>'), 'Welcome to &lt;i&gt;Italy&lt;/i&gt;', 'escapes html entities');
-  $t->is($w->render('foo', 'SchÌßel'), 'SchÌßel', 'Does not html entity decode umlauts');
-  $t->is($w->render('foo', 'Welcome to <i>Italy</i>'), 'Welcome to <i>Italy</i>', 'Does not html entity tags (e.g. "<" chars)');  
+  $t->is($w->render('foo', 'SchÌßel'), 'Sch&uuml;&szlig;el', 'correctly escapes umlauts');
+  $t->is($w->render('foo', 'Welcome to <i>Italy</i>'), 'Welcome to &lt;i&gt;Italy&lt;/i&gt;', 'escapes html entities');
 
 $t->diag('nowrap option');