Changeset 6762

Timestamp:

12/27/07 16:44:55 (2 years ago)

Author:

fabien

Message:

fixed content type charset on non text/* content-type (closes #1811, #1968)

Files:

• branches/1.1/lib/response/sfWebResponse.class.php (modified) (1 diff)
• branches/1.1/test/unit/response/sfWebResponseTest.php (modified) (2 diffs)

branches/1.1/lib/response/sfWebResponse.class.php

@@ -247 +247 @@
-  {
-    // add charset if needed
-
+ && 0 === stripos($value, 'text/')
-    {
-      $value .= '; charset='.$this->getParameter('charset');

branches/1.1/test/unit/response/sfWebResponseTest.php

@@ -11 +11 @@
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-4
+5
-
-class myWebResponse extends sfWebResponse
@@ -111 +111 @@
-$t->is($response->getContentType(), 'text/xml;charset = ISO-8859-1', '->setContentType() does nothing if a charset is given');
-
+$response->setContentType('image/jpg');
+$t->is($response->getContentType(), 'image/jpg', '->setContentType() does not add a charset if the content-type is not text/*');
+
-$t->is($response->getContentType(), $response->getHttpHeader('content-type'), '->getContentType() is an alias for ->getHttpHeader(\'content-type\')');
-