Switch DOCTYPE's to the XHTML 5 DOCTYPE

author Craig Andrews <candrews@integralblue.com>

Wed, 5 Aug 2009 22:27:27 +0000 (18:27 -0400)

committer Craig Andrews <candrews@integralblue.com>

Wed, 5 Aug 2009 22:27:27 +0000 (18:27 -0400)
author Craig Andrews <candrews@integralblue.com>
Wed, 5 Aug 2009 22:27:27 +0000 (18:27 -0400)
committer Craig Andrews <candrews@integralblue.com>
Wed, 5 Aug 2009 22:27:27 +0000 (18:27 -0400)
diff --git a/install.php b/install.php

index 227f99789a7dee034b318a8e4cf247243535c540..ea2135651876f0b370ef107a473540b1515cc3e2 100644 (file)
--- a/install.php
+++ b/install.php
@@ -383,9 +383,7 @@ function runDbScript($filename, $conn, $type='mysql')
  
  ?>
  <?php echo"<?"; ?> xml version="1.0" encoding="UTF-8" <?php echo "?>"; ?>
-<!DOCTYPE html
-PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html>
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
      <head>
          <title>Install Laconica</title>
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php

index 06603ac05485660b206726ad217a769756f9713b..cba8a5f5e09b9023706c9635e27b3a80b51137cb 100644 (file)
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -110,9 +110,7 @@ class HTMLOutputter extends XMLOutputter
  
          $this->extraHeaders();
  
-        $this->startXML('html',
-                        '-//W3C//DTD XHTML 1.0 Strict//EN',
-                        'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
+        $this->startXML('html');
  
          $language = $this->getLanguage();
  
diff --git a/plugins/FBConnect/FBC_XDReceiver.php b/plugins/FBConnect/FBC_XDReceiver.php

index 57c98b4f14370e24df0e4fd93963295d936a6dae..d9677fca7b4b2531c852fb14f78fd132205cfa8f 100644 (file)
--- a/plugins/FBConnect/FBC_XDReceiver.php
+++ b/plugins/FBConnect/FBC_XDReceiver.php
@@ -47,9 +47,7 @@ class FBC_XDReceiverAction extends Action
          header('Expires:');
          header('Pragma:');
  
-        $this->startXML('html',
-                        '-//W3C//DTD XHTML 1.0 Strict//EN',
-                        'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
+        $this->startXML('html');
  
          $language = $this->getLanguage();
  
diff --git a/plugins/FBConnect/FBConnectPlugin.php b/plugins/FBConnect/FBConnectPlugin.php

index 6788793b25c6bd4ddd066802007a8db33a7d1a23..2fb10a6758bf40fe513a91eaa413a34d695ff599 100644 (file)
--- a/plugins/FBConnect/FBConnectPlugin.php
+++ b/plugins/FBConnect/FBConnectPlugin.php
@@ -82,9 +82,7 @@ class FBConnectPlugin extends Plugin
  
              $action->extraHeaders();
  
-            $action->startXML('html',
-                '-//W3C//DTD XHTML 1.0 Strict//EN',
-                'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
+            $action->startXML('html');
  
              $language = $action->getLanguage();
  
diff --git a/plugins/recaptcha/recaptcha.php b/plugins/recaptcha/recaptcha.php

index 5ef8352d18ab1881aaa139030a7207330c1389bd..38a860fc75e9b43b890ce1e0a643e20b1e88d0dd 100644 (file)
--- a/plugins/recaptcha/recaptcha.php
+++ b/plugins/recaptcha/recaptcha.php
@@ -65,9 +65,7 @@ class recaptcha extends Plugin
  
          $action->extraHeaders();
  
-        $action->startXML('html',
-            '-//W3C//DTD XHTML 1.0 Strict//EN',
-            'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
+        $action->startXML('html');
  
          $action->raw('<style type="text/css">#recaptcha_area{float:left;}</style>');
          return false;
diff --git a/tpl/index.php b/tpl/index.php

index 5f1ed843942ee286c05c4b883f43601b910eb874..be375e75a6397837db477599c163ab22a7f34315 100644 (file)
--- a/tpl/index.php
+++ b/tpl/index.php
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html
-PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html>
  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
         <head>
                 <title><?php echo section('title'); ?></title>
@@ -44,4 +42,4 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
                         </div>
                         </div>
                 </body>
-       </html>
-\ No newline at end of file
+       </html>
author	Craig Andrews <candrews@integralblue.com>
	Wed, 5 Aug 2009 22:27:27 +0000 (18:27 -0400)
committer	Craig Andrews <candrews@integralblue.com>
	Wed, 5 Aug 2009 22:27:27 +0000 (18:27 -0400)
install.php		patch \| blob \| history
lib/htmloutputter.php		patch \| blob \| history
plugins/FBConnect/FBC_XDReceiver.php		patch \| blob \| history
plugins/FBConnect/FBConnectPlugin.php		patch \| blob \| history
plugins/recaptcha/recaptcha.php		patch \| blob \| history
tpl/index.php		patch \| blob \| history