• R/O
  • HTTP
  • SSH
  • HTTPS

pukiwiki: Commit


Commit MetaInfo

Revisiondc10e467307721d15ecc5ae485582af32aa7d64e (tree)
Time2016-11-15 08:21:22
Authorumorigu <umorigu@gmai...>
Commiterumorigu

Log Message

BugTrack/2389 Use HTML5 DocType

* Use HTML5 DocType declaration
* Remove XHTML specific meta headers - content-style-type and
* Content-Script-Type

Change Summary

Incremental Difference

--- a/skin/pukiwiki.skin.php
+++ b/skin/pukiwiki.skin.php
@@ -56,19 +56,12 @@ header('Cache-control: no-cache');
5656 header('Pragma: no-cache');
5757 header('Content-Type: text/html; charset=' . CONTENT_CHARSET);
5858
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-
6659 ?>
60+<!DOCTYPE html>
61+<html lang="ja">
6762 <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 ?>" />
7064 <?php if ($nofollow || ! $is_read) { ?> <meta name="robots" content="NOINDEX,NOFOLLOW" /><?php } ?>
71- <meta http-equiv="Content-Script-Type" content="text/javascript" />
7265
7366 <title><?php echo $title ?> - <?php echo $page_title ?></title>
7467
--- a/skin/tdiary.skin.php
+++ b/skin/tdiary.skin.php
@@ -556,19 +556,12 @@ header('Cache-control: no-cache');
556556 header('Pragma: no-cache');
557557 header('Content-Type: text/html; charset=' . CONTENT_CHARSET);
558558
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-
566559 ?>
560+<!DOCTYPE html>
561+<html lang="ja">
567562 <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 ?>" />
570564 <?php if ($nofollow || ! $is_read) { ?> <meta name="robots" content="NOINDEX,NOFOLLOW" /><?php } ?>
571- <meta http-equiv="Content-Script-Type" content="text/javascript" />
572565
573566 <title><?php echo $title ?> - <?php echo $page_title ?></title>
574567
Show on old repository browser