Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-22 13:50:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into more-abstraction

Browse source
This commit is contained in:
Michael 2018-06-19 13:48:19 +00:00
commit a5ca724fd3
9 changed files with 1865 additions and 1859 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/api.php
View file

@ -3617,12 +3617,9 @@ api_register_func('api/direct_messages/destroy', 'api_direct_messages_destroy',
function api_direct_messages_box($type, $box, $verbose)
{
$a = get_app();
$user_info = api_get_user($a);
if (api_user() === false || $user_info === false) {
if (api_user() === false) {
throw new ForbiddenException();
}
// params
$count = (x($_GET, 'count') ? $_GET['count'] : 20);
$page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0);
@ -3643,6 +3640,10 @@ function api_direct_messages_box($type, $box, $verbose)
unset($_REQUEST["screen_name"]);
unset($_GET["screen_name"]);
$user_info = api_get_user($a);
if ($user_info === false) {
throw new ForbiddenException();
}
$profile_url = $user_info["url"];
// pagination