Fix 'doctype error' - #23.

gjbarnard · Jun 1, 2022 · 16df81d · 16df81d
1 parent 72e18a6
commit 16df81d
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/Changes.md b/Changes.md
@@ -14,6 +14,7 @@ Version 4.0.1.1 - TBR
 9. Fix 'Failing core PHPUnit test' - #19.
 10. Apply MDL-74602.
 11. Fix 'Collapsable in question preview won't work' - #22.
+12. Fix 'doctype error' - #23.
 
 Version 4.0.1.0 - 17/04/22
 --------------------------

diff --git a/layout/layout.php b/layout/layout.php
@@ -25,6 +25,9 @@
 
 defined('MOODLE_INTERNAL') || die;
 
+// Echo the document type here with the $OUTPUT global to prevent core complaining that it hasn't been output!
+echo $OUTPUT->doctype();
+
 // Get the renderer for this plugin.
 $toolbox = \theme_foundation\toolbox::get_instance();
 $output = $toolbox->get_core_renderer();

diff --git a/layout/maintenance.php b/layout/maintenance.php
@@ -25,6 +25,9 @@
 
 defined('MOODLE_INTERNAL') || die;
 
+// Echo the document type here with the $OUTPUT global to prevent core complaining that it hasn't been output!
+echo $OUTPUT->doctype();
+
 $data = new \stdClass();
 $data->output = $OUTPUT;
 

diff --git a/layout/plainlayout.php b/layout/plainlayout.php
@@ -25,6 +25,9 @@
 
 defined('MOODLE_INTERNAL') || die;
 
+// Echo the document type here with the $OUTPUT global to prevent core complaining that it hasn't been output!
+echo $OUTPUT->doctype();
+
 // Get the renderer for this plugin.
 $toolbox = \theme_foundation\toolbox::get_instance();
 $output = $toolbox->get_core_renderer();

diff --git a/templates/columns1.mustache b/templates/columns1.mustache
@@ -28,7 +28,6 @@
     {
         "sitename": "Moodle",
         "output": {
-            "doctype": "<!DOCTYPE html>",
             "htmlattributes": "lang='en'",
             "page_title": "Test page",
             "favicon": "favicon.ico",

diff --git a/templates/columns2.mustache b/templates/columns2.mustache
@@ -34,7 +34,6 @@
     {
         "sitename": "Moodle",
         "output": {
-            "doctype": "<!DOCTYPE html>",
             "htmlattributes": "lang='en'",
             "page_title": "Test page",
             "favicon": "favicon.ico",

diff --git a/templates/columns3.mustache b/templates/columns3.mustache
@@ -36,7 +36,6 @@
     {
         "sitename": "Moodle",
         "output": {
-            "doctype": "<!DOCTYPE html>",
             "htmlattributes": "lang='en'",
             "page_title": "Test page",
             "favicon": "favicon.ico",

diff --git a/templates/embedded.mustache b/templates/embedded.mustache
@@ -25,15 +25,13 @@
     Example context (json):
     {
         "output": {
-            "doctype": "<!DOCTYPE html>",
             "htmlattributes": "lang='en'",
             "page_title": "Test page",
             "favicon": "favicon.ico",
             "main_content": "<h1>Headings make html validators happier</h1>"
          }
     }
 }}
-{{{ output.doctype }}}
 <html {{{ output.htmlattributes }}}>
     <head>
         <title>{{{ output.page_title }}}</title>

diff --git a/templates/maintenance.mustache b/templates/maintenance.mustache
@@ -25,15 +25,13 @@
     Example context (json):
     {
         "output": {
-            "doctype": "<!DOCTYPE html>",
             "htmlattributes": "lang='en'",
             "page_title": "Maintenance page",
             "favicon": "favicon.ico",
             "main_content": "<h1>Headings make HTML validators happier</h1>"
         }
     }
 }}
-{{{ output.doctype }}}
 <html {{{ output.htmlattributes }}}>
     <head>
         <title>{{{ output.page_title }}}</title>

diff --git a/templates/partials/head.mustache b/templates/partials/head.mustache
@@ -25,14 +25,12 @@
     Example context (json):
     {
         "output": {
-            "doctype": "<!DOCTYPE html>",
             "htmlattributes": "lang='en'",
             "page_title": "Test page",
             "favicon": "favicon.ico"
         }
     }
 }}
-{{{ output.doctype }}}
 <html {{{ output.htmlattributes }}}>
 <head>
     <title>{{{ output.page_title }}}</title>