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

Merge pull request #12795 from annando/caps

Browse source 
Fix case
This commit is contained in:
Philipp 2023-02-14 22:27:12 +01:00 committed by GitHub
commit 453693122d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Api/Mastodon/Notifications.php
View file

@ -70,7 +70,7 @@ class Notifications extends BaseApi
$condition = ["`uid` = ? AND (NOT `type` IN (?, ?))", $uid, $condition = ["`uid` = ? AND (NOT `type` IN (?, ?))", $uid,
Post\UserNotification::TYPE_ACTIVITY_PARTICIPATION, Post\UserNotification::TYPE_ACTIVITY_PARTICIPATION,
POST\UserNotification::TYPE_COMMENT_PARTICIPATION]; Post\UserNotification::TYPE_COMMENT_PARTICIPATION];
if (!$request['include_all']) { if (!$request['include_all']) {
$condition = DBA::mergeConditions($condition, ['dismissed' => false]); $condition = DBA::mergeConditions($condition, ['dismissed' => false]);

2
src/Network/HTTPClient/Client/HttpClient.php
View file

@ -261,7 +261,7 @@ class HttpClient implements ICanSendHttpRequests
throw new TransferException($urlResult->getErrorMessageString(), $urlResult->getHTTPStatusCode() ?? 0); throw new TransferException($urlResult->getErrorMessageString(), $urlResult->getHTTPStatusCode() ?? 0);
} }
return $urlResult->getURL(); return $urlResult->getUrl();
} }
/** /**