diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/actions.php | 8 | ||||
| -rw-r--r-- | inc/init.php | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/inc/actions.php b/inc/actions.php index d4bd5b20e..fc15713d8 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -568,12 +568,10 @@ function act_export($act){ $output = rawWiki($ID,$REV); break; case 'xhtml': - $pre .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"' . DOKU_LF; - $pre .= ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' . DOKU_LF; - $pre .= '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'.$conf['lang'].'"' . DOKU_LF; - $pre .= ' lang="'.$conf['lang'].'" dir="'.$lang['direction'].'">' . DOKU_LF; + $pre .= '<!DOCTYPE html>' . DOKU_LF; + $pre .= '<html lang="'.$conf['lang'].'" dir="'.$lang['direction'].'">' . DOKU_LF; $pre .= '<head>' . DOKU_LF; - $pre .= ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />' . DOKU_LF; + $pre .= ' <meta charset="utf-8" />' . DOKU_LF; $pre .= ' <title>'.$ID.'</title>' . DOKU_LF; // get metaheaders diff --git a/inc/init.php b/inc/init.php index a28050736..00ab2afe9 100644 --- a/inc/init.php +++ b/inc/init.php @@ -497,8 +497,7 @@ function is_ssl(){ */ function nice_die($msg){ echo<<<EOT -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE html> <html> <head><title>DokuWiki Setup Error</title></head> <body style="font-family: Arial, sans-serif"> |