clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3264 from annando/1703-avoid-api-error 

Avoid API error when calling "/api/friendica/profile/show"
This commit is contained in:
Tobias Diekershoff 2017-03-25 16:25:20 +01:00 committed by GitHub
parent eb482c3acf adf9ed64bb
commit 81eec6b2b5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/api.php
View File

@ -3963,7 +3963,7 @@ use \Friendica\Core\Config;
$multi_profiles = feature_enabled(api_user(),'multi_profiles'); $multi_profiles = feature_enabled(api_user(),'multi_profiles');
$directory = get_config('system', 'directory'); $directory = get_config('system', 'directory');
// get data of the specified profile id or all profiles of the user if not specified // get data of the specified profile id or all profiles of the user if not specified
if ($profileid != 0) { if ($profileid != 0) {
$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d", $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d",
intval(api_user()), intval(api_user()),
@ -3971,11 +3971,10 @@ use \Friendica\Core\Config;
// error message if specified gid is not in database // error message if specified gid is not in database
if (!dbm::is_result($r)) if (!dbm::is_result($r))
throw new BadRequestException("profile_id not available"); throw new BadRequestException("profile_id not available");
} } else {
else
$r = q("SELECT * FROM `profile` WHERE `uid` = %d", $r = q("SELECT * FROM `profile` WHERE `uid` = %d",
intval(api_user())); intval(api_user()));
}
// loop through all returned profiles and retrieve data and users // loop through all returned profiles and retrieve data and users
$k = 0; $k = 0;
foreach ($r as $rr) { foreach ($r as $rr) {
@ -4002,9 +4001,11 @@ use \Friendica\Core\Config;
} }
// return settings, authenticated user and profiles data // return settings, authenticated user and profiles data
$self = q("SELECT `nurl` FROM `contact` WHERE `uid`= %d AND `self` LIMIT 1", intval(api_user()));
$result = array('multi_profiles' => $multi_profiles ? true : false, $result = array('multi_profiles' => $multi_profiles ? true : false,
'global_dir' => $directory, 'global_dir' => $directory,
'friendica_owner' => api_get_user($a, intval(api_user())), 'friendica_owner' => api_get_user($a, $self[0]['nurl']),
'profiles' => $profiles); 'profiles' => $profiles);
return api_format_data("friendica_profiles", $type, array('$result' => $result)); return api_format_data("friendica_profiles", $type, array('$result' => $result));
} }