aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-01-27 12:30:54 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-01-27 12:30:54 +0000
commit3c5c5154abddff39ec270ca82495a7923e4b254c (patch)
tree884af8b67353e50a2e1a91c986502bde5d5c2323 /phpBB/includes
parent9ebe6b6b1f05ac8fb0a4fdc395a76224ad17fbe7 (diff)
downloadforums-3c5c5154abddff39ec270ca82495a7923e4b254c.tar
forums-3c5c5154abddff39ec270ca82495a7923e4b254c.tar.gz
forums-3c5c5154abddff39ec270ca82495a7923e4b254c.tar.bz2
forums-3c5c5154abddff39ec270ca82495a7923e4b254c.tar.xz
forums-3c5c5154abddff39ec270ca82495a7923e4b254c.zip
#7424
- rebuild username_clean column due to changes in utf8_clean_string() git-svn-id: file:///svn/phpbb/trunk@6934 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/db/oracle.php2
-rw-r--r--phpBB/includes/functions.php13
2 files changed, 13 insertions, 2 deletions
diff --git a/phpBB/includes/db/oracle.php b/phpBB/includes/db/oracle.php
index dcb972d119..860c7a3614 100644
--- a/phpBB/includes/db/oracle.php
+++ b/phpBB/includes/db/oracle.php
@@ -46,7 +46,7 @@ class dbal_oracle extends dbal
*/
function sql_server_info()
{
- return 'Oracle ' . @ociserverversion($this->db_connect_id);
+ return @ociserverversion($this->db_connect_id);
}
/**
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 5c2d77ced0..5aadb5017e 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1580,7 +1580,18 @@ function redirect($url, $return = false)
if (@preg_match('#Microsoft|WebSTAR|Xitami#', getenv('SERVER_SOFTWARE')))
{
header('Refresh: 0; URL=' . $url);
- echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta http-equiv="refresh" content="0; url=' . $url . '"><title>Redirect</title></head><body><div align="center">' . sprintf($user->lang['URL_REDIRECT'], '<a href="' . $url . '">', '</a>') . '</div></body></html>';
+
+ echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
+ echo '<html xmlns="http://www.w3.org/1999/xhtml" dir="' . $user->lang['DIRECTION'] . '" lang="' . $user->lang['USER_LANG'] . '" xml:lang="' . $user->lang['USER_LANG'] . '">';
+ echo '<head>';
+ echo '<meta http-equiv="content-type" content="text/html; charset=utf-8" />';
+ echo '<meta http-equiv="refresh" content="0; url=' . $url . '" />';
+ echo '<title>' . $user->lang['REDIRECT'] . '</title>';
+ echo '</head>';
+ echo '<body>';
+ echo '<div style="text-align: center;">' . sprintf($user->lang['URL_REDIRECT'], '<a href="' . $url . '">', '</a>') . '</div>';
+ echo '</body>';
+ echo '</html>';
exit;
}