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

Merge pull request #4802 from Rudloff/feature/api_get_user 

api_get_user() should not return false right away if the number in the URL is not a valid user
This commit is contained in:
Hypolite Petovan 2018-04-10 05:28:56 -04:00 committed by GitHub
parent 799bd75fb2 f3d98b2864
commit d6893a45fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/api.php
View File

@ -577,15 +577,13 @@ function api_get_user(App $a, $contact_id = null)
if (is_numeric($user)) { if (is_numeric($user)) {
$user = dbesc(api_unique_id_to_nurl(intval($user))); $user = dbesc(api_unique_id_to_nurl(intval($user)));
if ($user == "") { if ($user != "") {
return false;
}
$url = $user; $url = $user;
$extra_query = "AND `contact`.`nurl` = '%s' "; $extra_query = "AND `contact`.`nurl` = '%s' ";
if (api_user() !== false) { if (api_user() !== false) {
$extra_query .= "AND `contact`.`uid`=" . intval(api_user()); $extra_query .= "AND `contact`.`uid`=" . intval(api_user());
} }
}
} else { } else {
$user = dbesc($user); $user = dbesc($user);
$extra_query = "AND `contact`.`nick` = '%s' "; $extra_query = "AND `contact`.`nick` = '%s' ";