aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2009-05-20 12:37:35 +0000
committerChris Smith <toonarmy@phpbb.com>2009-05-20 12:37:35 +0000
commit6e11b7181d4bdc5542add123a13bd74953d77ddb (patch)
tree6b736a7e26262598d6f5594a467813fe2b4a143e /phpBB
parent8037937eb817f184092a0d8db344b068222f9ee2 (diff)
downloadforums-6e11b7181d4bdc5542add123a13bd74953d77ddb.tar
forums-6e11b7181d4bdc5542add123a13bd74953d77ddb.tar.gz
forums-6e11b7181d4bdc5542add123a13bd74953d77ddb.tar.bz2
forums-6e11b7181d4bdc5542add123a13bd74953d77ddb.tar.xz
forums-6e11b7181d4bdc5542add123a13bd74953d77ddb.zip
Fix installer under PHP 5.3. #45255
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9518 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/includes/functions_install.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index d609e11a5a..60a0b9ddfc 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -154,6 +154,7 @@
<li>[Fix] Fix column handling in db updater, custom profile fields an db tools for firebird DBMS (Bug #44555)</li>
<li>[Fix] IE8 textarea issues (Bug #43305)</li>
<li>[Fix] Prevent accounts from being activated by users when admin activation is turned on and the correct activation key is known.</li>
+ <li>[Fix] Allow the installer to operate under PHP 5.3. (Bug #45255)</li>
<li>[Change] Default difference view is now 'inline' instead of 'side by side'</li>
<li>[Change] Added new option for merging differences to conflicting files in automatic updater</li>
<li>[Change] Add link to user profile in the MCP for user notes and warn user.</li>
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 90459813f1..611b0a7bc3 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
*/
function can_load_dll($dll)
{
- 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;
+ return ((@ini_get('enable_dl') || strtolower(@ini_get('enable_dl')) == 'on') && (!@ini_get('safe_mode') || strtolower(@ini_get('safe_mode')) == 'off') && function_exists('dl') && @dl($dll . '.' . PHP_SHLIB_SUFFIX)) ? true : false;
}
/**