Revision | dc10e467307721d15ecc5ae485582af32aa7d64e (tree) |
---|---|
Time | 2016-11-15 08:21:22 |
Author | ![]() |
Commiter | umorigu |
BugTrack/2389 Use HTML5 DocType
* Use HTML5 DocType declaration
* Remove XHTML specific meta headers - content-style-type and
* Content-Script-Type
@@ -56,19 +56,12 @@ header('Cache-control: no-cache'); | ||
56 | 56 | header('Pragma: no-cache'); |
57 | 57 | header('Content-Type: text/html; charset=' . CONTENT_CHARSET); |
58 | 58 | |
59 | -// HTML DTD, <html>, and receive content-type | |
60 | -if (isset($pkwk_dtd)) { | |
61 | - $meta_content_type = pkwk_output_dtd($pkwk_dtd); | |
62 | -} else { | |
63 | - $meta_content_type = pkwk_output_dtd(); | |
64 | -} | |
65 | - | |
66 | 59 | ?> |
60 | +<!DOCTYPE html> | |
61 | +<html lang="ja"> | |
67 | 62 | <head> |
68 | - <?php echo $meta_content_type ?> | |
69 | - <meta http-equiv="content-style-type" content="text/css" /> | |
63 | + <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CONTENT_CHARSET ?>" /> | |
70 | 64 | <?php if ($nofollow || ! $is_read) { ?> <meta name="robots" content="NOINDEX,NOFOLLOW" /><?php } ?> |
71 | - <meta http-equiv="Content-Script-Type" content="text/javascript" /> | |
72 | 65 | |
73 | 66 | <title><?php echo $title ?> - <?php echo $page_title ?></title> |
74 | 67 |
@@ -556,19 +556,12 @@ header('Cache-control: no-cache'); | ||
556 | 556 | header('Pragma: no-cache'); |
557 | 557 | header('Content-Type: text/html; charset=' . CONTENT_CHARSET); |
558 | 558 | |
559 | -// HTML DTD, <html>, and receive content-type | |
560 | -if (isset($pkwk_dtd)) { | |
561 | - $meta_content_type = pkwk_output_dtd($pkwk_dtd); | |
562 | -} else { | |
563 | - $meta_content_type = pkwk_output_dtd(); | |
564 | -} | |
565 | - | |
566 | 559 | ?> |
560 | +<!DOCTYPE html> | |
561 | +<html lang="ja"> | |
567 | 562 | <head> |
568 | - <?php echo $meta_content_type ?> | |
569 | - <meta http-equiv="content-style-type" content="text/css" /> | |
563 | + <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CONTENT_CHARSET ?>" /> | |
570 | 564 | <?php if ($nofollow || ! $is_read) { ?> <meta name="robots" content="NOINDEX,NOFOLLOW" /><?php } ?> |
571 | - <meta http-equiv="Content-Script-Type" content="text/javascript" /> | |
572 | 565 | |
573 | 566 | <title><?php echo $title ?> - <?php echo $page_title ?></title> |
574 | 567 |