Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-22 18:40:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14567 from Art4/merge-2024.09-rc-into-develop

Browse source 
Merge 2024.09-rc branch into develop
This commit is contained in:
Hypolite Petovan 2024-11-21 10:06:57 -05:00 committed by GitHub
commit 84f9c0ef1f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/Model/Post/Media.php
View file

@ -846,7 +846,7 @@ class Media
} }
/** /**
* Update post-media entries * Update post-media entries by id
* *
* @param array $fields * @param array $fields
* @param int $id * @param int $id
@ -857,6 +857,18 @@ class Media
return DBA::update('post-media', $fields, ['id' => $id]); return DBA::update('post-media', $fields, ['id' => $id]);
} }
/**
* Update post-media entries
*
* @param array $fields
* @param array $condition
* @return boolean
*/
public static function update(array $fields, array $condition): bool
{
return DBA::update('post-media', $fields, $condition);
}
/** /**
* Checks if media attachments are associated with the provided item ID. * Checks if media attachments are associated with the provided item ID.
* *

4
src/Module/OpenSearch.php
View file

@ -27,9 +27,6 @@ class OpenSearch extends BaseModule
/** @var IManageConfigValues */ /** @var IManageConfigValues */
private $config; private $config;
/** @var App\baseUrl */
protected $baseUrl;
/** @var string */ /** @var string */
private $basePath; private $basePath;
@ -39,7 +36,6 @@ class OpenSearch extends BaseModule
$this->config = $config; $this->config = $config;
$this->basePath = $basePath->getPath(); $this->basePath = $basePath->getPath();
$this->baseUrl = $baseUrl;
} }
/** /**