From f1d61e4bbb8fdee7320de94db7a23d0d655f3907 Mon Sep 17 00:00:00 2001 From: Graham Cole <chckens@sucs.org> Date: Fri, 30 Sep 2011 13:53:48 +0000 Subject: [PATCH] switch to HTML5 doctype. Hopefully without breakage --- htdocs/index.php | 8 ++------ templates/head.tpl | 5 ++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/htdocs/index.php b/htdocs/index.php index 9ee2aad..45bcb2b 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -156,12 +156,8 @@ $smarty->assign("user_messages", $messages); // Render the results if (!(isset($no_template)) || (!$no_template)) { // Send appropriate Content-Type - if (preg_match('#application/xhtml\+xml#', @$_SERVER['HTTP_ACCEPT'])) { - header('Content-Type: application/xhtml+xml'); - echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"; - } else { - header('Content-Type: text/html'); - } + header('Content-Type:text/html; charset=UTF-8'); + $smarty->display("head.tpl"); $smarty->display("index.tpl"); diff --git a/templates/head.tpl b/templates/head.tpl index 2bc226b..75a223e 100644 --- a/templates/head.tpl +++ b/templates/head.tpl @@ -1,6 +1,5 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$language.code}"> +<!doctype html> +<html lang="{$language.code}"> <head> <title>{$title} - SUCS</title> -- GitLab