Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 19:50:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/2023.03-rc' into npf2

Browse source
This commit is contained in:
Michael 2023-03-27 06:42:24 +00:00
commit c4c80ed3cc
266 changed files with 691 additions and 643 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Post/Link.php
View file

@ -58,7 +58,7 @@ class Link
* @param int $uriId
* @param string $url
* @param string $size
* @return string Found link URL + id on success, $url on failture
* @return string Found link URL + id on success, $url on failure
*/
public static function getByLink(int $uriId, string $url, string $size = ''): string
{

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

@ -455,7 +455,7 @@ class Media
}
/**
* Tests for path patterns that are usef for picture links in Friendica
* Tests for path patterns that are used for picture links in Friendica
*
* @param string $page Link to the image page
* @param string $preview Preview picture
@ -467,7 +467,7 @@ class Media
}
/**
* Tests for path patterns that are usef for picture links in Friendica
* Tests for path patterns that are used for picture links in Friendica
*
* @param string $page Link to the image page
* @param string $preview Preview picture