don't use openid CURL wrapper if open_basedir is set (even if safe_mode isn't)

diff --git a/library/openid.php b/library/openid.php
index eec652bb18a7becda5971affec5856dd9d91c742..3c58beb8a5eccb63cc77102094fff4beb128e654 100644 (file)
--- a/library/openid.php
+++ b/library/openid.php
@@ -276,7 +276,7 @@ class LightOpenID
 
     protected function request($url, $method='GET', $params=array())
     {
-        if(function_exists('curl_init') && !ini_get('safe_mode')) {
+        if(function_exists('curl_init') && !ini_get('safe_mode') && (! strlen(ini_get('open_basedir')))) {
             return $this->request_curl($url, $method, $params);
         }
         return $this->request_streams($url, $method, $params);

diff --git a/mod/directory.php b/mod/directory.php
index 062aae516f91816c08e1776b4a1b5930e79ec647..e1c83f05e3b6d000c2567a864530dad892c82c57 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -40,6 +40,8 @@ function directory_content(&$a) {
        $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : "");
 
 
+
+
        $r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1 AND `user`.`blocked` = 0 $sql_extra ");
        if(count($r))
                $a->set_pager_total($r[0]['total']);