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/install | |
| 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/install')
| -rw-r--r-- | phpBB/install/database_update.php | 18 | ||||
| -rw-r--r-- | phpBB/install/index.php | 5 |
2 files changed, 6 insertions, 17 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 615122da4f..bf3dec5bab 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -205,15 +205,10 @@ $ga_forum_id = request_var('ga_forum_id', 0); if ($has_global && !$ga_forum_id) { ?> - <!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="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>" xml:lang="<?php echo $lang['USER_LANG']; ?>"> + <!DOCTYPE html> + <html dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>"> <head> - <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> - <meta http-equiv="content-language" content="<?php echo $lang['USER_LANG']; ?>" /> - <meta http-equiv="content-style-type" content="text/css" /> - <meta http-equiv="imagetoolbar" content="no" /> - <title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title> <link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" /> @@ -259,15 +254,10 @@ if ($has_global && !$ga_forum_id) header('Content-type: text/html; charset=UTF-8'); ?> -<!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="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>" xml:lang="<?php echo $lang['USER_LANG']; ?>"> +<!DOCTYPE html> +<html dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>"> <head> -<meta http-equiv="content-type" content="text/html; charset=UTF-8" /> -<meta http-equiv="content-language" content="<?php echo $lang['USER_LANG']; ?>" /> -<meta http-equiv="content-style-type" content="text/css" /> -<meta http-equiv="imagetoolbar" content="no" /> - <title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title> <link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" /> diff --git a/phpBB/install/index.php b/phpBB/install/index.php index cd3c8fbaa8..9d241a9224 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -553,10 +553,9 @@ class module return; } - 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>' . $lang['INST_ERR_FATAL'] . '</title>'; echo '<link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />'; echo '</head>'; |