mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00
Code Issues Releases Wiki Activity

Change the handling of language detection to avoid errors if the language header is either not sent by the browser or there is no matching language available.

Browse Source 
Also added support for forcing a language via the URL for now, this may or may not remain


git-svn-id: file:///svn/phpbb/trunk@5676 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Graham Eames
2006-03-20 21:03:51 +00:00
parent c01c69e63f
commit 41d2a2052c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/install/index.php
View File

@@ -72,7 +72,8 @@ if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals
define('STRIP', (get_magic_quotes_gpc()) ? true : false);
// Try and load an appropriate language if required
if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']))// && !$language)
$language = request_var('language', '');
if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) && $language == '')
{
$accept_lang_ary = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
foreach ($accept_lang_ary as $accept_lang)
@@ -99,7 +100,7 @@ if (!empty($_SERVER['HTTP_ACCEPT_LANGUAGE']))// && !$language)
// No appropriate language found ... so let's use the first one in the language
// dir, this may or may not be English
if (!$language)
if ($language == '')
{
$dir = @opendir($phpbb_root_path . 'language');
while ($file = readdir($dir))
@@ -183,7 +184,7 @@ class module
$this->error('No installation modules found', __LINE__, __FILE__);
}
foreach($module as $row)
foreach ($module as $row)
{
// Check any module pre-reqs
if ($row['module_reqs'] != '')
@@ -426,7 +427,7 @@ class module
}
echo ' <p>' . $lang['INST_ERR_FATAL'] . "</p>\n";
echo ' <p>' . $file . ' [ ' . $line . " ]</p>\n";
echo ' <p>' . basename($file) . ' [ ' . $line . " ]</p>\n";
echo ' <p><b>' . $error . "</b></p>\n";
if ($skip)
@@ -465,7 +466,7 @@ class module
echo ' <h2 style="color:red;text-align:center">' . $lang['INST_ERR_FATAL'] . "</h2>\n";
echo ' <p>' . $lang['INST_ERR_FATAL_DB'] . "</p>\n";
echo ' <p>' . $file . ' [ ' . $line . " ]</p>\n";
echo ' <p>' . basename($file) . ' [ ' . $line . " ]</p>\n";
echo ' <p>SQL : ' . $sql . "</p>\n";
echo ' <p><b>' . $error . "</b></p>\n";