diff options
| author | Evan Prodromou <evan@status.net> | 2009-09-23 09:45:22 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-09-23 09:45:22 -0400 |
| commit | 8284b3cb82f4dec6e0f2bf74dea6e1a3bc7f4eac (patch) | |
| tree | 09b8c466df2476f9219550464eb73f6ecaa54e1c /extlib/Auth | |
| parent | 2cabfba767ba0d92d34a6ea4e4cf91c7325f3e95 (diff) | |
| parent | bef4a8b6ba9e19f2ec629031444279ca76f17bcf (diff) | |
Merge branch '0.8.x' into 0.9.x
Conflicts:
actions/requesttoken.php
classes/File.php
install.php
lib/noticeform.php
Diffstat (limited to 'extlib/Auth')
| -rw-r--r-- | extlib/Auth/OpenID/BigMath.php | 2 | ||||
| -rw-r--r-- | extlib/Auth/Yadis/XML.php | 2 |
2 files changed, 2 insertions, 2 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; } diff --git a/extlib/Auth/Yadis/XML.php b/extlib/Auth/Yadis/XML.php index 4854f12bb..7232d6cbd 100644 --- a/extlib/Auth/Yadis/XML.php +++ b/extlib/Auth/Yadis/XML.php @@ -349,7 +349,7 @@ function &Auth_Yadis_getXMLParser() foreach ($extensions as $name => $params) { if (!extension_loaded($name)) { foreach ($params['libname'] as $libname) { - if (@dl($libname)) { + if (function_exists('dl') && ini_get('enable_dl') && !ini_get('safe_mode') && @dl($libname)) { $classname = $params['classname']; } } |