Detect enable_dl off or safe_mode on PEAR::loadExtension()

diff --git a/pear/PEAR.php b/pear/PEAR.php
index 84994fee1781b81a58a6327ff7ebc9fb2df6b2d9..5305537fb17c956b37d06ba036aac67e19b87b6d 100644 (file)
--- a/pear/PEAR.php
+++ b/pear/PEAR.php
@@ -225,7 +225,7 @@ class PEAR
      * @param   mixed $data   the value to test
      * @param   int   $code   if $data is an error object, return true
      *                        only if $code is a string and
-     *                        $obj->getMessage() == $code or 
+     *                        $obj->getMessage() == $code or
      *                        $code is an integer and $obj->getCode() == $code
      * @access  public
      * @return  bool    true if parameter is an error
@@ -621,6 +621,10 @@ class PEAR
     function loadExtension($ext)
     {
         if (!extension_loaded($ext)) {
+            // if either returns true dl() will produce a FATAL error, stop that
+            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
+                return false;
+            }
             if (OS_WINDOWS) {
                 $suffix = '.dll';
             } elseif (PHP_OS == 'HP-UX') {