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

[friendica.git] / src / Module / Api / Friendica / Photoalbum / Delete.php

diff --git a/src/Module/Api/Friendica/Photoalbum/Delete.php b/src/Module/Api/Friendica/Photoalbum/Delete.php
index f6dc85fcea662fb28425b40b567c3459188afa36..8c277d39eb5391ca14478a3a25e18ec23489b152 100644 (file)
--- a/src/Module/Api/Friendica/Photoalbum/Delete.php
+++ b/src/Module/Api/Friendica/Photoalbum/Delete.php
@@ -34,14 +34,14 @@ use Friendica\Network\HTTPException\InternalServerErrorException;
  */
 class Delete extends BaseApi
 {
-       public static function rawContent()
+       protected function post(array $request = [], array $post = [])
        {
                self::checkAllowedScope(self::SCOPE_WRITE);
                $uid = self::getCurrentUserID();
 
                $request = self::getRequest([
                        'album' => '', // Album name
-               ]);
+               ], $request);
 
                // we do not allow calls without album string
                if (empty($request['album'])) {
@@ -67,7 +67,7 @@ class Delete extends BaseApi
                // return success of deletion or error message
                if ($result) {
                        $answer = ['result' => 'deleted', 'message' => 'album `' . $request['album'] . '` with all containing photos has been deleted.'];
-                       DI::apiResponse()->exit('photoalbum_delete', ['$result' => $answer], static::$parameters['extension'] ?? null);
+                       $this->response->exit('photoalbum_delete', ['$result' => $answer], $this->parameters['extension'] ?? null);
                } else {
                        throw new InternalServerErrorException("unknown error - deleting from database failed");
                }