[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1737-g5c03f00

Wed May 3 10:18:17 CEST 2017

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  5c03f0049d6e47a3d2eaeda1f48d453992abfbd5 (commit)
      from  f6f0ee57d6c7a2f19d75e19cbb54443c81bebd9a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=5c03f0049d6e47a3d2eaeda1f48d453992abfbd5

commit 5c03f0049d6e47a3d2eaeda1f48d453992abfbd5
Author: Marc-Etienne Vargenau <marc-etienne.vargenau at nokia.com>
Date:   Wed May 3 10:18:04 2017 +0200

    Use HTML 5 doctype

diff --git a/src/www/include/Layout.class.php b/src/www/include/Layout.class.php
index 950d566..4cf00fc 100644
--- a/src/www/include/Layout.class.php
+++ b/src/www/include/Layout.class.php
@@ -43,15 +43,6 @@ require_once $gfcommon.'include/Navigation.class.php';
 abstract class Layout extends FFError {
 
 	/**
-	 * Which doctype to use. Can be configured in the
-	 * constructor. If set to 'strict', headerHTMLDeclaration will
-	 * create a doctype definition that uses the strict doctype,
-	 * otherwise it will use the transitional doctype.
-	 * @var string $doctype
-	 */
-	var $doctype = 'transitional';
-
-	/**
 	 * The default main page content
 	 * @var	string	$rootindex
 	 */
@@ -296,19 +287,12 @@ abstract class Layout extends FFError {
 
 	/**
 	 * headerHTMLDeclaration() - generates the HTML declaration, i.e. the
-	 * XML declaration, the doctype definition, and the opening <html>.
+	 * HTML 5 doctype definition, and the opening <html>.
 	 *
 	 */
 	function headerHTMLDeclaration() {
-		global $sysDTDs, $sysXMLNSs;
-
-		print '<' . '?xml version="1.0" encoding="utf-8"?>'."\n";
-		if (!util_ifsetor($this->doctype) || !util_ifsetor($sysDTDs[$this->doctype])) {
-			$this->doctype = 'transitional';
-		}
-		echo $sysDTDs[$this->doctype]['doctype'] . "\n";
-		echo '<html xml:lang="' . _('en') . '" lang="' . _('en') .
-		    '" ' . $sysXMLNSs . ">\n";
+		print "<!DOCTYPE html>\n";
+		echo '<html xml:lang="' . _('en') . '" lang="' . _('en') .  '" ' . ">\n";
 	}
 
 	/**

-----------------------------------------------------------------------

Summary of changes:
 src/www/include/Layout.class.php | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
FusionForge

