aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2011-07-29 16:32:22 +0200
committerIgor Wiedler <igor@wiedler.ch>2011-07-29 16:32:22 +0200
commit681c4a478d6eff7dbcebadca04f4afa28da750a8 (patch)
treece20076a61ed9411f5f16c9a3fbe878b6edad684 /phpBB/includes
parent04c0d6461f342dcc9d5e5d12eacbf881d4833799 (diff)
downloadforums-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
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/db/dbal.php1
-rw-r--r--phpBB/includes/functions.php2
-rw-r--r--phpBB/includes/functions_download.php1
3 files changed, 4 insertions, 0 deletions
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('&', '&amp;', $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>';