mirror of
https://github.com/friendica/friendica
synced 2024-12-22 14:00:15 +00:00
Merge pull request #14567 from Art4/merge-2024.09-rc-into-develop
Merge 2024.09-rc branch into develop
This commit is contained in:
commit
84f9c0ef1f
2 changed files with 13 additions and 5 deletions
|
@ -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.
|
||||||
*
|
*
|
||||||
|
|
|
@ -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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue