diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-07-20 09:21:16 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-07-20 09:21:16 -0400 |
| commit | ddbad5551d45876ca18c2bb3a93506b092261792 (patch) | |
| tree | 292b23ef5d59a4561f66a9967a59eb5366661d0c /phpBB/includes | |
| parent | 014dc53a80ad04fc4d0b7f219dcd60da16d08bee (diff) | |
| parent | 136a932303d7d7a427043d1834b6df40dc219b0e (diff) | |
| download | forums-ddbad5551d45876ca18c2bb3a93506b092261792.tar forums-ddbad5551d45876ca18c2bb3a93506b092261792.tar.gz forums-ddbad5551d45876ca18c2bb3a93506b092261792.tar.bz2 forums-ddbad5551d45876ca18c2bb3a93506b092261792.tar.xz forums-ddbad5551d45876ca18c2bb3a93506b092261792.zip | |
Merge remote-tracking branch 'github-igorw/ticket/10258' into develop
* github-igorw/ticket/10258:
[ticket/10258] Remove the meta charset tag
[ticket/10258] Adjust some deprecated tags for HTML5 in coding-guidelines
[ticket/10258] Remove copyright meta tag from docs
[ticket/10258] Remove resource-type and distribution meta tags
[ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags
[ticket/10258] Change the DOCTYPE to HTML5
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/db/dbal.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 10 | ||||
| -rw-r--r-- | phpBB/includes/functions_download.php | 3 |
3 files changed, 7 insertions, 13 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index b29e2791ab..962b997664 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -767,12 +767,9 @@ class dbal $mtime = explode(' ', microtime()); $totaltime = $mtime[0] + $mtime[1] - $starttime; - echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr"> + echo '<!DOCTYPE html> + <html dir="ltr"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <meta http-equiv="Content-Style-Type" content="text/css" /> - <meta http-equiv="imagetoolbar" content="no" /> <title>SQL Report</title> <link href="' . $phpbb_root_path . 'adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" /> </head> diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index f5b087e304..65e8bc251e 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2297,10 +2297,9 @@ function redirect($url, $return = false, $disable_cd_check = false) { header('Refresh: 0; URL=' . $url); - echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'; - echo '<html xmlns="http://www.w3.org/1999/xhtml" dir="' . $user->lang['DIRECTION'] . '" lang="' . $user->lang['USER_LANG'] . '" xml:lang="' . $user->lang['USER_LANG'] . '">'; + echo '<!DOCTYPE html>'; + echo '<html dir="' . $user->lang['DIRECTION'] . '" lang="' . $user->lang['USER_LANG'] . '">'; echo '<head>'; - echo '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'; echo '<meta http-equiv="refresh" content="0; url=' . str_replace('&', '&', $url) . '" />'; echo '<title>' . $user->lang['REDIRECT'] . '</title>'; echo '</head>'; @@ -3814,10 +3813,9 @@ function msg_handler($errno, $msg_text, $errfile, $errline) // Try to not call the adm page data... - echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'; - echo '<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">'; + echo '<!DOCTYPE html>'; + echo '<html dir="ltr">'; echo '<head>'; - echo '<meta http-equiv="content-type" content="text/html; charset=utf-8" />'; echo '<title>' . $msg_title . '</title>'; echo '<style type="text/css">' . "\n" . '/* <![CDATA[ */' . "\n"; echo '* { margin: 0; padding: 0; } html { font-size: 100%; height: 100%; margin-bottom: 1px; background-color: #E4EDF0; } body { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; color: #536482; background: #E4EDF0; font-size: 62.5%; margin: 0; } '; diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index 94bcb36698..cbb79009ad 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -100,10 +100,9 @@ function send_avatar_to_browser($file, $browser) */ function wrap_img_in_html($src, $title) { - echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-Strict.dtd">'; + echo '<!DOCTYPE html>'; echo '<html>'; echo '<head>'; - echo '<meta http-equiv="content-type" content="text/html; charset=UTF-8" />'; echo '<title>' . $title . '</title>'; echo '</head>'; echo '<body>'; |