diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-07-29 16:32:22 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-07-29 16:32:22 +0200 |
| commit | 681c4a478d6eff7dbcebadca04f4afa28da750a8 (patch) | |
| tree | ce20076a61ed9411f5f16c9a3fbe878b6edad684 | |
| parent | 04c0d6461f342dcc9d5e5d12eacbf881d4833799 (diff) | |
| download | forums-681c4a478d6eff7dbcebadca04f4afa28da750a8.tar forums-681c4a478d6eff7dbcebadca04f4afa28da750a8.tar.gz forums-681c4a478d6eff7dbcebadca04f4afa28da750a8.tar.bz2 forums-681c4a478d6eff7dbcebadca04f4afa28da750a8.tar.xz forums-681c4a478d6eff7dbcebadca04f4afa28da750a8.zip | |
[ticket/10258] Add HTML5 meta charset tag
This allows knowing the charset when saving web pages to disk. Also, this is
supported by all browsers.
PHPBB3-10258
| -rw-r--r-- | phpBB/adm/style/colour_swatch.html | 1 | ||||
| -rw-r--r-- | phpBB/adm/style/install_header.html | 1 | ||||
| -rw-r--r-- | phpBB/adm/style/install_update_diff.html | 1 | ||||
| -rw-r--r-- | phpBB/adm/style/overall_header.html | 1 | ||||
| -rw-r--r-- | phpBB/adm/style/simple_header.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/db/dbal.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_download.php | 1 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 2 | ||||
| -rw-r--r-- | phpBB/install/index.php | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/overall_header.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/simple_header.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_print.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/overall_header.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/simple_header.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html | 1 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/viewtopic_print.html | 1 |
17 files changed, 19 insertions, 0 deletions
diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html index b5627a790f..e731620bd3 100644 --- a/phpBB/adm/style/colour_swatch.html +++ b/phpBB/adm/style/colour_swatch.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> +<meta charset="utf-8"> <title>{L_COLOUR_SWATCH}</title> <style type="text/css"> diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html index cc36643e10..e306d8f6bf 100644 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> +<meta charset="utf-8"> <!-- IF META -->{META}<!-- ENDIF --> <title>{PAGE_TITLE}</title> diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index 7fccb06b5a..39c73d5652 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> +<meta charset="utf-8"> <!-- IF META -->{META}<!-- ENDIF --> <title>{PAGE_TITLE}</title> diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index 0b0bd3274d..be5ac29131 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> +<meta charset="utf-8"> <!-- IF META -->{META}<!-- ENDIF --> <title>{PAGE_TITLE}</title> diff --git a/phpBB/adm/style/simple_header.html b/phpBB/adm/style/simple_header.html index ef9b21bb15..84ff665acc 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> +<meta charset="utf-8"> <!-- IF META -->{META}<!-- ENDIF --> <title>{PAGE_TITLE}</title> diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index 962b997664..a61dc5f58a 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -770,6 +770,7 @@ class dbal echo '<!DOCTYPE html> <html dir="ltr"> <head> + <meta charset="utf-8"> <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 65e8bc251e..e1a4b1a4c9 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2300,6 +2300,7 @@ function redirect($url, $return = false, $disable_cd_check = false) echo '<!DOCTYPE html>'; echo '<html dir="' . $user->lang['DIRECTION'] . '" lang="' . $user->lang['USER_LANG'] . '">'; echo '<head>'; + echo '<meta charset="utf-8">'; echo '<meta http-equiv="refresh" content="0; url=' . str_replace('&', '&', $url) . '" />'; echo '<title>' . $user->lang['REDIRECT'] . '</title>'; echo '</head>'; @@ -3816,6 +3817,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline) echo '<!DOCTYPE html>'; echo '<html dir="ltr">'; echo '<head>'; + echo '<meta 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 cbb79009ad..91a09608c7 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -103,6 +103,7 @@ function wrap_img_in_html($src, $title) echo '<!DOCTYPE html>'; echo '<html>'; echo '<head>'; + echo '<meta charset="utf-8">'; echo '<title>' . $title . '</title>'; echo '</head>'; echo '<body>'; diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index bf3dec5bab..79aa57aea0 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -208,6 +208,7 @@ if ($has_global && !$ga_forum_id) <!DOCTYPE html> <html dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>"> <head> + <meta charset="utf-8"> <title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title> @@ -257,6 +258,7 @@ header('Content-type: text/html; charset=UTF-8'); <!DOCTYPE html> <html dir="<?php echo $lang['DIRECTION']; ?>" lang="<?php echo $lang['USER_LANG']; ?>"> <head> +<meta charset="utf-8"> <title><?php echo $lang['UPDATING_TO_LATEST_STABLE']; ?></title> diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 9d241a9224..f4815c3108 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -556,6 +556,7 @@ class module echo '<!DOCTYPE html>'; echo '<html dir="ltr">'; echo '<head>'; + echo '<meta 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>'; diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index bc171a31de..9f022e215d 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> +<meta charset="utf-8"> <meta name="keywords" content="" /> <meta name="description" content="" /> {META} diff --git a/phpBB/styles/prosilver/template/simple_header.html b/phpBB/styles/prosilver/template/simple_header.html index 072550b95c..9a196ab7c6 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> +<meta charset="utf-8"> <meta name="keywords" content="" /> <meta name="description" content="" /> {META} diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html index c268163854..8a8ea87f00 100644 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ b/phpBB/styles/prosilver/template/viewtopic_print.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> +<meta charset="utf-8"> <meta name="keywords" content="" /> <meta name="description" content="" /> <meta name="robots" content="noindex" /> diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html index 4d646ac0e7..4fca1b6c09 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> +<meta charset="utf-8"> <meta name="keywords" content="" /> <meta name="description" content="" /> {META} diff --git a/phpBB/styles/subsilver2/template/simple_header.html b/phpBB/styles/subsilver2/template/simple_header.html index c88eea524a..79236434f2 100644 --- a/phpBB/styles/subsilver2/template/simple_header.html +++ b/phpBB/styles/subsilver2/template/simple_header.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> +<meta charset="utf-8"> <meta name="keywords" content="" /> <meta name="description" content="" /> {META} diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html index 6eb8396dbf..e52389cc15 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> +<meta charset="utf-8"> <title>{SITENAME} :: {PAGE_TITLE}</title> <style type="text/css"> diff --git a/phpBB/styles/subsilver2/template/viewtopic_print.html b/phpBB/styles/subsilver2/template/viewtopic_print.html index c05066aa14..07da8ef752 100644 --- a/phpBB/styles/subsilver2/template/viewtopic_print.html +++ b/phpBB/styles/subsilver2/template/viewtopic_print.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> +<meta charset="utf-8"> <title>{SITENAME} :: {PAGE_TITLE}</title> <style type="text/css"> |