1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

some adjustements to the installer

git-svn-id: file:///svn/phpbb/trunk@9284 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2009-01-21 17:03:00 +00:00
parent dcd073bb44
commit 9f060eba6e
6 changed files with 125 additions and 50 deletions

View File

@@ -769,7 +769,8 @@ class install_install extends module
// Create a list of any PHP modules we wish to have loaded
$load_extensions = array();
$available_dbms = get_available_dbms($data['dbms']);
$check_exts = array_merge(array($available_dbms[$data['dbms']]['MODULE']), $this->php_dlls_other);
$check_exts = array_merge($this->php_dlls_other);
foreach ($check_exts as $dll)
{
@@ -784,6 +785,37 @@ class install_install extends module
}
}
$db_module = $available_dbms[$data['dbms']]['MODULE'];
if (!is_array($db_module))
{
$db_module = array($db_module);
}
$load_dll = true;
foreach ($db_module as $dll)
{
if (@extension_loaded($dll))
{
$load_dll = false;
break;
}
if (!can_load_dll($dll))
{
$load_dll = false;
break;
}
$load_dll = true;
}
if ($load_dll)
{
$dll = current($db_module);
$load_extensions[] = $dll . '.' . PHP_SHLIB_SUFFIX;
}
// Create a lock file to indicate that there is an install in progress
$fp = @fopen(PHPBB_ROOT_PATH . 'cache/install_lock', 'wb');
if ($fp === false)