summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas V.V.Cox <cox@php.net>2002-06-17 13:50:33 +0000
committerTomas V.V.Cox <cox@php.net>2002-06-17 13:50:33 +0000
commit80361edcb65840d41bc6cb0b09c92cd9d1f37f0c (patch)
tree62e10a93144100c505f7ef632076b08b7535b4b7
parent87ddd960276487a9479f49c4f92477b5ef5a7b08 (diff)
downloadphp-git-80361edcb65840d41bc6cb0b09c92cd9d1f37f0c.tar.gz
Use the new PEAR::loadExtension() in checkExtension() instead
of the "hack"
-rw-r--r--pear/PEAR/Dependency.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/pear/PEAR/Dependency.php b/pear/PEAR/Dependency.php
index 4db89d2948..38d2eb762e 100644
--- a/pear/PEAR/Dependency.php
+++ b/pear/PEAR/Dependency.php
@@ -134,11 +134,8 @@ class PEAR_Dependency
function checkExtension($name, $req = null, $relation = 'has')
{
// XXX (ssb): could we avoid loading the extension here?
- if (!extension_loaded($name)) {
- $dlext = OS_WINDOWS ? '.dll' : '.so';
- if (!@dl($name . $dlext)) {
- return "'$name' PHP extension is not installed";
- }
+ if (!PEAR::loadExtension($name)) {
+ return "'$name' PHP extension is not installed";
}
if ($relation == 'has') {
return false;