mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/2021.12-rc' into api-fixes

Browse source
This commit is contained in:
Michael 2021-11-29 12:52:00 +00:00
parent 477b8a91db 6688a2cca4
commit 6bd9c9f496
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Api/Friendica/Group/Delete.php
View file

@ -70,7 +70,7 @@ class Delete extends BaseApi
if ($ret) {
// return success
$success = ['success' => $ret, 'gid' => $request['gid'], 'name' => $request['name'], 'status' => 'deleted', 'wrong users' => []];
$this->response->exit('group_delete', ['$result' => $success], $parameters['extension'] ?? null);
$this->response->exit('group_delete', ['$result' => $success], $this->parameters['extension'] ?? null);
} else {
throw new BadRequestException('other API error');
}

2
src/Module/Api/Friendica/Group/Update.php
View file

@ -84,6 +84,6 @@ class Update extends BaseApi
// return success message incl. missing users in array
$status = ($erroraddinguser ? 'missing user' : 'ok');
$success = ['success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers];
DI::apiResponse()->exit('group_update', ['$result' => $success], $parameters['extension'] ?? null);
DI::apiResponse()->exit('group_update', ['$result' => $success], $this->parameters['extension'] ?? null);
}
}

4
src/Module/Contact/Profile.php
View file

@ -157,10 +157,10 @@ class Profile extends BaseModule
$this->baseUrl->redirect('profile/' . $contact['nick'] . '/profile');
}
if (isset($parameters['action'])) {
if (isset($this->parameters['action'])) {
self::checkFormSecurityTokenRedirectOnError('contact/' . $contact['id'], 'contact_action', 't');
$cmd = $parameters['action'];
$cmd = $this->parameters['action'];
if ($cmd === 'update' && $localRelationship->rel !== Contact::NOTHING) {
Module\Contact::updateContactFromPoll($contact['id']);
}