diff options
author | Craig Andrews <candrews@integralblue.com> | 2009-09-24 17:15:54 -0400 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2009-09-24 17:15:54 -0400 |
commit | 49bce941a9aae495ee7221bd367791227487b458 (patch) | |
tree | 91858ee586473045158f6bb539e26af8168ecd84 /extlib/Auth/OpenID | |
parent | 3d30ad83f881a69d76b57a9af051fef308644987 (diff) | |
parent | 5323956e388ebc2e4dfa1a5193aa670c96fff027 (diff) |
Merge remote branch 'statusnet/0.8.x' into 0.9.x
Conflicts:
EVENTS.txt
actions/requesttoken.php
classes/File.php
install.php
lib/action.php
lib/noticeform.php
Diffstat (limited to 'extlib/Auth/OpenID')
-rw-r--r-- | extlib/Auth/OpenID/BigMath.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extlib/Auth/OpenID/BigMath.php b/extlib/Auth/OpenID/BigMath.php index 45104947d..b5fc627a0 100644 --- a/extlib/Auth/OpenID/BigMath.php +++ b/extlib/Auth/OpenID/BigMath.php @@ -376,7 +376,7 @@ function Auth_OpenID_detectMathLibrary($exts) // Try to load dynamic modules. if (!$loaded) { foreach ($extension['modules'] as $module) { - if (@dl($module . "." . PHP_SHLIB_SUFFIX)) { + if (function_exists('dl') && ini_get('enable_dl') && !ini_get('safe_mode') && @dl($module . "." . PHP_SHLIB_SUFFIX)) { $loaded = true; break; } |