aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-07-03 15:36:18 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-07-03 15:36:18 +0000
commitb883ff119f4e42fbc967a6b1971af2198762fbd8 (patch)
tree95341356c3efea7cad58309f28c224c45296f1f5 /phpBB/install
parent3d9b5e52d9a14495f42d676428b6d00aff756923 (diff)
downloadforums-b883ff119f4e42fbc967a6b1971af2198762fbd8.tar
forums-b883ff119f4e42fbc967a6b1971af2198762fbd8.tar.gz
forums-b883ff119f4e42fbc967a6b1971af2198762fbd8.tar.bz2
forums-b883ff119f4e42fbc967a6b1971af2198762fbd8.tar.xz
forums-b883ff119f4e42fbc967a6b1971af2198762fbd8.zip
let's see if i can break something. :o
git-svn-id: file:///svn/phpbb/trunk@7830 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
-rwxr-xr-xphpBB/install/install_install.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 5b753d12ca..7fd4c881c6 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -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);