aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
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/install
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/install')
-rw-r--r--phpBB/install/database_update.php2
-rw-r--r--phpBB/install/index.php1
2 files changed, 3 insertions, 0 deletions
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>';