diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2021-06-09 20:46:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-09 20:46:05 +0200 |
| commit | bb2b946c51459a0a16b745fe0d9605d26c7a3875 (patch) | |
| tree | 374f6f50f26aab4d5f2a97cce5581e817107070d | |
| parent | 70483a16a3a232758979bb6fa363629b5a16b6a4 (diff) | |
| parent | ebf35fb38a770f26b5db4d6eebba18a28fa10dcd (diff) | |
| download | nextcloud-server-bb2b946c51459a0a16b745fe0d9605d26c7a3875.tar.gz nextcloud-server-bb2b946c51459a0a16b745fe0d9605d26c7a3875.zip | |
Merge pull request #27430 from nextcloud/fix/feedback_response_check
Correctly check the reception of a remote feedback
4 files changed, 5 insertions, 5 deletions
diff --git a/apps/federatedfilesharing/lib/Notifications.php b/apps/federatedfilesharing/lib/Notifications.php index b3d41cde851..c72a0691fad 100644 --- a/apps/federatedfilesharing/lib/Notifications.php +++ b/apps/federatedfilesharing/lib/Notifications.php @@ -405,7 +405,7 @@ class Notifications { * @param $fields * @param $action * - * @return bool + * @return array|false */ protected function tryOCMEndPoint($remoteDomain, $fields, $action) { switch ($action) { diff --git a/apps/files_sharing/lib/External/Manager.php b/apps/files_sharing/lib/External/Manager.php index 720df28d107..e51bd64cf38 100644 --- a/apps/files_sharing/lib/External/Manager.php +++ b/apps/files_sharing/lib/External/Manager.php @@ -365,7 +365,7 @@ class Manager { private function sendFeedbackToRemote($remote, $token, $remoteId, $feedback) { $result = $this->tryOCMEndPoint($remote, $token, $remoteId, $feedback); - if ($result === true) { + if (is_array($result)) { return true; } @@ -401,7 +401,7 @@ class Manager { * @param string $token * @param string $remoteId id of the share * @param string $feedback - * @return bool + * @return array|false */ protected function tryOCMEndPoint($remoteDomain, $token, $remoteId, $feedback) { switch ($feedback) { diff --git a/lib/private/Federation/CloudFederationProviderManager.php b/lib/private/Federation/CloudFederationProviderManager.php index 206b0ae5635..c19ca8429ca 100644 --- a/lib/private/Federation/CloudFederationProviderManager.php +++ b/lib/private/Federation/CloudFederationProviderManager.php @@ -167,7 +167,7 @@ class CloudFederationProviderManager implements ICloudFederationProviderManager /** * @param string $url * @param ICloudFederationNotification $notification - * @return mixed + * @return array|false */ public function sendNotification($url, ICloudFederationNotification $notification) { $ocmEndPoint = $this->getOCMEndPoint($url); diff --git a/lib/public/Federation/ICloudFederationProviderManager.php b/lib/public/Federation/ICloudFederationProviderManager.php index 33719687006..e607b0555ab 100644 --- a/lib/public/Federation/ICloudFederationProviderManager.php +++ b/lib/public/Federation/ICloudFederationProviderManager.php @@ -89,7 +89,7 @@ interface ICloudFederationProviderManager { * * @param string $url * @param ICloudFederationNotification $notification - * @return mixed + * @return array|false * * @since 14.0.0 */ |