jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Friendika 2011-01-02 21:01:07 -08:00
parent 0fb3aa1b57
commit 0a485e6664
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/openid.php
View file

@ -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);

2
mod/directory.php
View file

@ -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']);