Changeset 6723

Timestamp:

12/26/07 22:23:48 (2 years ago)

Author:

fabien

Message:

added functional tests for view escaping

Files:

• branches/1.1/lib/view/sfEscapedViewParameterHolder.class.php (modified) (1 diff)
• branches/1.1/test/functional/escapingTest.php (added)
• branches/1.1/test/functional/fixtures/project/apps/frontend/modules/escaping (added)
• branches/1.1/test/functional/fixtures/project/apps/frontend/modules/escaping/actions (added)
• branches/1.1/test/functional/fixtures/project/apps/frontend/modules/escaping/actions/actions.class.php (added)
• branches/1.1/test/functional/fixtures/project/apps/frontend/modules/escaping/templates (added)
• branches/1.1/test/functional/fixtures/project/apps/frontend/modules/escaping/templates/indexSuccess.php (added)

branches/1.1/lib/view/sfEscapedViewParameterHolder.class.php

@@ -68 +68 @@
-    $attributes = array();
-
-    $escapedData = sfOutputEscaper::escape($this->getEscapingMethod(), $this->getAll());
-
-    switch ($this->getEscaping())
-    {
+      case 'on':
+        $escapedData = sfOutputEscaper::escape($this->getEscapingMethod(), $this->getAll());
+        $attributes['sf_data'] = $escapedData;
+        break;
-      case 'bc':
+        $escapedData = sfOutputEscaper::escape($this->getEscapingMethod(), $this->getAll());
-        $attributes = $this->getAll();
+        $attributes['sf_data'] = $escapedData;
-        break;
-      case 'both':
+        $escapedData = sfOutputEscaper::escape($this->getEscapingMethod(), $this->getAll());
-        foreach ($escapedData as $key => $value)
-        {
-          $attributes[$key] = $value;
-        }
+        $attributes['sf_data'] = $escapedData;
+        break;
+      case 'off':
+        $attributes = $this->getAll();
-        break;
-    }
-
-    $attributes['sf_data'] = $escapedData;
-
-    return $attributes;