aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-07-30 16:49:39 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-07-30 16:49:39 +0200
commit366b14b6c5775507295b9ee1470a7a1a84c834b2 (patch)
tree25d2e490fcf60e367e13bad0ace30646ab6fa683 /phpBB/includes/functions.php
parentcb74439046a4bfcf9856aa5bdeff430a8a672e44 (diff)
parent681c4a478d6eff7dbcebadca04f4afa28da750a8 (diff)
downloadforums-366b14b6c5775507295b9ee1470a7a1a84c834b2.tar
forums-366b14b6c5775507295b9ee1470a7a1a84c834b2.tar.gz
forums-366b14b6c5775507295b9ee1470a7a1a84c834b2.tar.bz2
forums-366b14b6c5775507295b9ee1470a7a1a84c834b2.tar.xz
forums-366b14b6c5775507295b9ee1470a7a1a84c834b2.zip
Merge remote-tracking branch 'igorw/ticket/10258' into develop
* igorw/ticket/10258: [ticket/10258] Add HTML5 meta charset tag
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 3281141b8e..fb7aafe636 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; } ';