diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-07-30 16:49:39 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-07-30 16:49:39 +0200 |
| commit | 366b14b6c5775507295b9ee1470a7a1a84c834b2 (patch) | |
| tree | 25d2e490fcf60e367e13bad0ace30646ab6fa683 /phpBB/includes | |
| parent | cb74439046a4bfcf9856aa5bdeff430a8a672e44 (diff) | |
| parent | 681c4a478d6eff7dbcebadca04f4afa28da750a8 (diff) | |
| download | forums-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')
| -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 |
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 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('&', '&', $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>'; |