diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-07-12 01:32:00 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-07-12 01:32:00 +0200 |
| commit | 136a932303d7d7a427043d1834b6df40dc219b0e (patch) | |
| tree | 20e4abd1ccf8b1be2eae71d869e74e8b279fce59 | |
| parent | af1c8747ce5de2b0b056be851e08f7578b2c3807 (diff) | |
| download | forums-136a932303d7d7a427043d1834b6df40dc219b0e.tar forums-136a932303d7d7a427043d1834b6df40dc219b0e.tar.gz forums-136a932303d7d7a427043d1834b6df40dc219b0e.tar.bz2 forums-136a932303d7d7a427043d1834b6df40dc219b0e.tar.xz forums-136a932303d7d7a427043d1834b6df40dc219b0e.zip | |
[ticket/10258] Remove the meta charset tag
The charset tag is useless, because if a charset content-type header is
present it takes precedence. And phpBB always sends such a header.
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 | 3 | ||||
| -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/ucp_pm_viewmessage_print.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 |
18 files changed, 0 insertions, 21 deletions
diff --git a/phpBB/adm/style/colour_swatch.html b/phpBB/adm/style/colour_swatch.html index 81e3bd9af6..b5627a790f 100644 --- a/phpBB/adm/style/colour_swatch.html +++ b/phpBB/adm/style/colour_swatch.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> -<meta charset="{S_CONTENT_ENCODING}"> <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 58bbd68673..cc36643e10 100644 --- a/phpBB/adm/style/install_header.html +++ b/phpBB/adm/style/install_header.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> -<meta charset="{S_CONTENT_ENCODING}"> <!-- 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 2f38aa1ed4..7fccb06b5a 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> -<meta charset="{S_CONTENT_ENCODING}"> <!-- 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 d6d4717537..0b0bd3274d 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> -<meta charset="{S_CONTENT_ENCODING}"> <!-- 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 166d02b0c1..ef9b21bb15 100644 --- a/phpBB/adm/style/simple_header.html +++ b/phpBB/adm/style/simple_header.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> -<meta charset="{S_CONTENT_ENCODING}"> <!-- IF META -->{META}<!-- ENDIF --> <title>{PAGE_TITLE}</title> diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index a61dc5f58a..962b997664 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -770,7 +770,6 @@ 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 7ff32d3071..a40ff0ef8b 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2251,7 +2251,6 @@ 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>'; @@ -3759,7 +3758,6 @@ 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 91a09608c7..cbb79009ad 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -103,7 +103,6 @@ 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 b8fe493ab8..3f3ff59c5d 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -209,8 +209,6 @@ if ($has_global && !$ga_forum_id) <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> <link href="../adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" /> @@ -259,7 +257,6 @@ 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 d8a953fd28..b2a2caa145 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -557,7 +557,6 @@ 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 8783584b58..ab7b70179a 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> -<meta charset="{S_CONTENT_ENCODING}"> <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 034a4aae5b..11cc3bd6e9 100644 --- a/phpBB/styles/prosilver/template/simple_header.html +++ b/phpBB/styles/prosilver/template/simple_header.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> -<meta charset="{S_CONTENT_ENCODING}"> <meta name="keywords" content="" /> <meta name="description" content="" /> {META} diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html index 7ad8632e8a..10879c5b14 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage_print.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> -<meta charset="{S_CONTENT_ENCODING}"> <title>{SITENAME} :: {PAGE_TITLE}</title> <style type="text/css"> diff --git a/phpBB/styles/prosilver/template/viewtopic_print.html b/phpBB/styles/prosilver/template/viewtopic_print.html index e54532dcdb..c268163854 100644 --- a/phpBB/styles/prosilver/template/viewtopic_print.html +++ b/phpBB/styles/prosilver/template/viewtopic_print.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> -<meta charset="{S_CONTENT_ENCODING}"> <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 cd6afb0a4d..4d646ac0e7 100644 --- a/phpBB/styles/subsilver2/template/overall_header.html +++ b/phpBB/styles/subsilver2/template/overall_header.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> -<meta charset="{S_CONTENT_ENCODING}"> <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 37046fd3b5..c88eea524a 100644 --- a/phpBB/styles/subsilver2/template/simple_header.html +++ b/phpBB/styles/subsilver2/template/simple_header.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> -<meta charset="{S_CONTENT_ENCODING}"> <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 c1faeb2460..6eb8396dbf 100644 --- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html +++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> -<meta charset="{S_CONTENT_ENCODING}"> <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 0deae2427a..c05066aa14 100644 --- a/phpBB/styles/subsilver2/template/viewtopic_print.html +++ b/phpBB/styles/subsilver2/template/viewtopic_print.html @@ -1,7 +1,6 @@ <!DOCTYPE html> <html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}"> <head> -<meta charset="{S_CONTENT_ENCODING}"> <title>{SITENAME} :: {PAGE_TITLE}</title> <style type="text/css"> |