mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-11 03:04:09 +02:00
let's see if i can break something. :o
git-svn-id: file:///svn/phpbb/trunk@7830 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -380,7 +380,7 @@ class install_install extends module
|
||||
}
|
||||
|
||||
// Can we find Imagemagick anywhere on the system?
|
||||
$exe = (defined('PHP_OS') && strpos(strtolower(PHP_OS), 'win') === 0) ? '.exe' : '';
|
||||
$exe = (DIRECTORY_SEPARATOR == '\\') ? '.exe' : '';
|
||||
|
||||
$magic_home = getenv('MAGICK_HOME');
|
||||
$img_imagick = '';
|
||||
@@ -868,8 +868,6 @@ class install_install extends module
|
||||
$available_dbms = get_available_dbms($dbms);
|
||||
$check_exts = array_merge(array($available_dbms[$dbms]['MODULE']), $this->php_dlls_other);
|
||||
|
||||
$suffix = (defined('PHP_OS') && strpos(strtolower(PHP_OS), 'win') === 0) ? 'dll' : 'so';
|
||||
|
||||
foreach ($check_exts as $dll)
|
||||
{
|
||||
if (!@extension_loaded($dll))
|
||||
@@ -879,7 +877,7 @@ class install_install extends module
|
||||
continue;
|
||||
}
|
||||
|
||||
$load_extensions[] = "$dll.$suffix";
|
||||
$load_extensions[] = $dll . '.' . PHP_SHLIB_SUFFIX;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -892,6 +890,8 @@ class install_install extends module
|
||||
}
|
||||
@fclose($fp);
|
||||
|
||||
@chmod($phpbb_root_path . 'cache/install_lock', 0666);
|
||||
|
||||
$dbpasswd = htmlspecialchars_decode($dbpasswd);
|
||||
$load_extensions = implode(',', $load_extensions);
|
||||
|
||||
|
Reference in New Issue
Block a user