Merge remote-tracking branch 'upstream/2021.12-rc' into user-banner

This commit is contained in:
Michael 2022-01-19 18:41:31 +00:00
commit 7d21f6f8d3
8 changed files with 75 additions and 45 deletions

View file

@ -1014,10 +1014,17 @@ class Photo
}
/**
*
* @param int $uid User ID
* @param array $files uploaded file array
* @param int $uid User ID
* @param array $files uploaded file array
* @param string $album
* @param string|null $allow_cid
* @param string|null $allow_gid
* @param string $deny_cid
* @param string $deny_gid
* @param string $desc
* @param string $resource_id
* @return array photo record
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function upload(int $uid, array $files, string $album = '', string $allow_cid = null, string $allow_gid = null, string $deny_cid = '', string $deny_gid = '', string $desc = '', string $resource_id = ''): array
{