OSDN Git Service

(root) / pukiwiki / pukiwiki.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fd549e4)
BugTrack/2389 Use HTML5 DocType
authorumorigu <umorigu@gmail.com>
Mon, 14 Nov 2016 23:21:22 +0000 (08:21 +0900)
committerumorigu <umorigu@gmail.com>
Mon, 14 Nov 2016 23:21:22 +0000 (08:21 +0900)
* Use HTML5 DocType declaration
* Remove XHTML specific meta headers - content-style-type and
* Content-Script-Type

skin/pukiwiki.skin.php patch | blob | history
skin/tdiary.skin.php patch | blob | history

diff --git a/skin/pukiwiki.skin.php b/skin/pukiwiki.skin.php
index 104e4b4..6843b82 100644 (file)
--- a/skin/pukiwiki.skin.php
+++ b/skin/pukiwiki.skin.php
@@ -56,19 +56,12 @@ header('Cache-control: no-cache');
 header('Pragma: no-cache');
 header('Content-Type: text/html; charset=' . CONTENT_CHARSET);
 
-// HTML DTD, <html>, and receive content-type
-if (isset($pkwk_dtd)) {
-       $meta_content_type = pkwk_output_dtd($pkwk_dtd);
-} else {
-       $meta_content_type = pkwk_output_dtd();
-}
-
 ?>
+<!DOCTYPE html>
+<html lang="ja">
 <head>
- <?php echo $meta_content_type ?>
- <meta http-equiv="content-style-type" content="text/css" />
+ <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CONTENT_CHARSET ?>" />
 <?php if ($nofollow || ! $is_read)  { ?> <meta name="robots" content="NOINDEX,NOFOLLOW" /><?php } ?>
- <meta http-equiv="Content-Script-Type" content="text/javascript" />
 
  <title><?php echo $title ?> - <?php echo $page_title ?></title>
 
diff --git a/skin/tdiary.skin.php b/skin/tdiary.skin.php
index 72bcfc2..e4b1c2c 100644 (file)
--- a/skin/tdiary.skin.php
+++ b/skin/tdiary.skin.php
@@ -556,19 +556,12 @@ header('Cache-control: no-cache');
 header('Pragma: no-cache');
 header('Content-Type: text/html; charset=' . CONTENT_CHARSET);
 
-// HTML DTD, <html>, and receive content-type
-if (isset($pkwk_dtd)) {
-       $meta_content_type = pkwk_output_dtd($pkwk_dtd);
-} else {
-       $meta_content_type = pkwk_output_dtd();
-}
-
 ?>
+<!DOCTYPE html>
+<html lang="ja">
 <head>
- <?php echo $meta_content_type ?>
- <meta http-equiv="content-style-type" content="text/css" />
+ <meta http-equiv="Content-Type" content="text/html; charset=<?php echo CONTENT_CHARSET ?>" />
 <?php if ($nofollow || ! $is_read)  { ?> <meta name="robots" content="NOINDEX,NOFOLLOW" /><?php } ?>
- <meta http-equiv="Content-Script-Type" content="text/javascript" />
 
  <title><?php echo $title ?> - <?php echo $page_title ?></title>
 
About OSDN
Find Software
Develop Software
Help