Changing default docType to 'html5'

cakephp · Dec 5, 2011 · 7249714 · 7249714
1 parent c6f492d
commit 7249714
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php b/lib/Cake/Test/Case/View/Helper/HtmlHelperTest.php
@@ -169,7 +169,7 @@ public function tearDown() {
  */
 	public function testDocType() {
 		$result = $this->Html->docType();
-		$expected = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
+		$expected = '<!DOCTYPE html>';
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Html->docType('html4-strict');
@@ -662,7 +662,7 @@ public function testScript() {
  */
 	function testScriptAssetFilter() {
 		Configure::write('Asset.filter.js', 'js.php');
-	
+
 		$result = $this->Html->script('jquery-1.3');
 		$expected = array(
 			'script' => array('type' => 'text/javascript', 'src' => 'cjs/jquery-1.3.js')

diff --git a/lib/Cake/View/Helper/HtmlHelper.php b/lib/Cake/View/Helper/HtmlHelper.php
@@ -198,7 +198,7 @@ public function addCrumb($name, $link = null, $options = null) {
  *  - html4-strict:  HTML4 Strict.
  *  - html4-trans:  HTML4 Transitional.
  *  - html4-frame:  HTML4 Frameset.
- *  - html5: HTML5.
+ *  - html5: HTML5. Default value.
  *  - xhtml-strict: XHTML1 Strict.
  *  - xhtml-trans: XHTML1 Transitional.
  *  - xhtml-frame: XHTML1 Frameset.
@@ -208,7 +208,7 @@ public function addCrumb($name, $link = null, $options = null) {
  * @return string Doctype string
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#HtmlHelper::docType
  */
-	public function docType($type = 'xhtml-strict') {
+	public function docType($type = 'html5') {
 		if (isset($this->_docTypes[$type])) {
 			return $this->_docTypes[$type];
 		}