aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_install.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-02 01:05:36 +0100
committerNils Adermann <naderman@naderman.de>2010-03-02 01:05:36 +0100
commit1ceddd9eeccde56ab307631a16e40b943eac883a (patch)
treed1045042f004c0d551658e8192b75965139f3707 /phpBB/includes/functions_install.php
parent0e0c8d78199cfa2dd56a62266df33655c93367ff (diff)
parentaadda939732ee163c3babedf4afcd914af12a2cc (diff)
downloadforums-1ceddd9eeccde56ab307631a16e40b943eac883a.tar
forums-1ceddd9eeccde56ab307631a16e40b943eac883a.tar.gz
forums-1ceddd9eeccde56ab307631a16e40b943eac883a.tar.bz2
forums-1ceddd9eeccde56ab307631a16e40b943eac883a.tar.xz
forums-1ceddd9eeccde56ab307631a16e40b943eac883a.zip
Merge commit 'release-3.0-RC3'
Diffstat (limited to 'phpBB/includes/functions_install.php')
-rw-r--r--phpBB/includes/functions_install.php9
1 files changed, 1 insertions, 8 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 61ac1883b3..133ef294b0 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -13,14 +13,7 @@
*/
function can_load_dll($dll)
{
- global $suffix;
-
- if (empty($suffix))
- {
- $suffix = (defined('PHP_OS') && strpos(strtolower(PHP_OS), 'win') === 0) ? 'dll' : 'so';
- }
-
- return ((@ini_get('enable_dl') || strtolower(@ini_get('enable_dl')) == 'on') && (!@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'off') && @dl($dll . ".$suffix")) ? true : false;
+ return ((@ini_get('enable_dl') || strtolower(@ini_get('enable_dl')) == 'on') && (!@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'off') && @dl($dll . '.' . PHP_SHLIB_SUFFIX)) ? true : false;
}
/**