HTML5 meta charset

cakephp · Jan 27, 2016 · cbb81ac · cbb81ac
1 parent 62885ab
commit cbb81ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/View/Helper/HtmlHelper.php b/src/View/Helper/HtmlHelper.php
@@ -74,7 +74,7 @@ class HtmlHelper extends Helper
             'parastart' => '<p{{attrs}}>',
             'css' => '<link rel="{{rel}}" href="{{url}}"{{attrs}}/>',
             'style' => '<style{{attrs}}>{{content}}</style>',
-            'charset' => '<meta http-equiv="Content-Type" content="text/html; charset={{charset}}"/>',
+            'charset' => '<meta charset={{charset}}"/>',
             'ul' => '<ul{{attrs}}>{{content}}</ul>',
             'ol' => '<ol{{attrs}}>{{content}}</ol>',
             'li' => '<li{{attrs}}>{{content}}</li>',

diff --git a/tests/TestCase/View/ViewTest.php b/tests/TestCase/View/ViewTest.php
@@ -1267,7 +1267,7 @@ public function testRender()
         $View->templatePath($this->PostsController->name);
         $result = $View->render('index');
 
-        $this->assertRegExp("/<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=utf-8\"\/>\s*<title>/", $result);
+        $this->assertRegExp("/<meta charset=utf-8\"\/>\s*<title>/", $result);
         $this->assertRegExp("/<div id=\"content\">\s*posts index\s*<\/div>/", $result);
         $this->assertRegExp("/<div id=\"content\">\s*posts index\s*<\/div>/", $result);
 
@@ -1286,7 +1286,7 @@ public function testRender()
         $View->templatePath($this->PostsController->name);
         $result = $View->render('index');
 
-        $this->assertRegExp("/<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=utf-8\"\/>\s*<title>/", $result);
+        $this->assertRegExp("/<meta charset=utf-8\"\/>\s*<title>/", $result);
         $this->assertRegExp("/<div id=\"content\">\s*posts index\s*<\/div>/", $result);
     }