mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-7861 Better setting of strict in other debug modes too

Browse Source
This commit is contained in:
moodler 2007-01-03 01:51:02 +00:00
parent 2533830067
commit 8af1b1ba80
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/weblib.php
View File

@ -2205,9 +2205,7 @@ function print_header ($title='', $heading='', $navigation='', $focus='',
$output = ob_get_contents();
ob_end_clean();
if (debugging(NULL, DEBUG_DEVELOPER)) { // In developer debugging mode, convert page to XHTML strict
$output = debug_header($output);
}
$output = force_strict_header($output);
if (!empty($CFG->messaging)) {
$output .= message_popup_window();
@ -2227,12 +2225,12 @@ function print_header ($title='', $heading='', $navigation='', $focus='',
* See: http://tracker.moodle.org/browse/MDL-7883
* TODO:
*/
function debug_header($output) {
function force_strict_header($output) {
global $CFG;
$strict = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
$xsl = '/lib/xhtml.xsl';
if (!headers_sent()) {
if (!headers_sent() && debugging(NULL, DEBUG_DEVELOPER)) { // In developer debugging, the browser will barf
$ctype = 'Content-Type: ';
$prolog= "<?xml version='1.0' encoding='utf-8'?>\n";
@ -2265,6 +2263,12 @@ function debug_header($output) {
$output .= "__ TEST: XML well-formed error < __\n";
}
}
if (debugging()) { // In any other debugging mode > NONE, strict is on
// Substitute document-type, s (PCRE_DOTALL)
$output = preg_replace('/(<!DOCTYPE.+?>)/s', $strict, $output);
}
return $output;
}