friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Functions renamed

This commit is contained in:
Michael 2020-10-29 08:48:08 +00:00
parent e548d647aa
commit 5ac73a847d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Item.php
View File

@ -1818,7 +1818,7 @@ class Item
} }
// Remove all media attachments from the body and store them in the post-media table // Remove all media attachments from the body and store them in the post-media table
$item['raw-body'] = Post\Media::addAttachmentsFromBody($item['uri-id'], $item['raw-body']); $item['raw-body'] = Post\Media::insertFromBody($item['uri-id'], $item['raw-body']);
$item['raw-body'] = self::setHashtags($item['raw-body']); $item['raw-body'] = self::setHashtags($item['raw-body']);
// Check for hashtags in the body and repair or add hashtag links // Check for hashtags in the body and repair or add hashtag links

8
src/Model/Post/Media.php
View File

@ -34,9 +34,9 @@ use Friendica\Util\Images;
*/ */
class Media class Media
{ {
const UNKNOWN = 0; const UNKNOWN = 0;
const IMAGE = 1; const IMAGE = 1;
const VIDEO = 2; const VIDEO = 2;
const AUDIO = 3; const AUDIO = 3;
const TORRENT = 16; const TORRENT = 16;
@ -104,7 +104,7 @@ class Media
* @param string $body * @param string $body
* @return string Body without media links * @return string Body without media links
*/ */
public static function addAttachmentsFromBody(int $uriid, string $body) public static function insertFromBody(int $uriid, string $body)
{ {
// Simplify image codes // Simplify image codes
$body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body); $body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);

4
src/Protocol/Diaspora.php
View File

@ -2817,7 +2817,7 @@ class Diaspora
* @param object $photo * @param object $photo
* @return void * @return void
*/ */
private static function storePhoto(int $uriid, $photo) private static function storePhotoAsMedia(int $uriid, $photo)
{ {
$data = []; $data = [];
$data['uri-id'] = $uriid; $data['uri-id'] = $uriid;
@ -2878,7 +2878,7 @@ class Diaspora
// Attach embedded pictures to the body // Attach embedded pictures to the body
if ($data->photo) { if ($data->photo) {
foreach ($data->photo as $photo) { foreach ($data->photo as $photo) {
self::storePhoto($datarray['uri-id'], $photo); self::storePhotoAsMedia($datarray['uri-id'], $photo);
$body = "[img]".XML::unescape($photo->remote_photo_path). $body = "[img]".XML::unescape($photo->remote_photo_path).
XML::unescape($photo->remote_photo_name)."[/img]\n".$body; XML::unescape($photo->remote_photo_name)."[/img]\n".$body;
} }