friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #708 from annando/notices-oh-yeah 

Removed notices that still had been creeping around ...
pull/710/head
Tobias Diekershoff 2018-08-17 09:27:02 +02:00 committed by GitHub
parent 2ed63ea72e 564235debd
commit 16439189e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pumpio/pumpio.php
View File

@ -1203,7 +1203,10 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
$reply->cc = $post->cc;
}
if (isset($post->to)) {
$reply->to = $post->to;
}
$reply->object = new stdClass;
$reply->object->objectType = $post->object->inReplyTo->objectType;
$reply->object->content = $post->object->inReplyTo->content;
@ -1271,10 +1274,15 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
$share_author = $post->object->author->url;
}
if (isset($post->object->created)) {
$created = DateTimeFormat::utc($post->object->created);
} else {
$created = '';
}
$postarray['body'] = share_header($share_author, $post->object->author->url,
$post->object->author->image->url, "",
DateTimeFormat::utc($post->object->created),
$post->links->self->href).
$created, $post->links->self->href).
$postarray['body']."[/share]";
}

2
statusnet/statusnet.php
View File

@ -1441,7 +1441,7 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false)
$tempfile = tempnam(get_temppath(), "cache");
file_put_contents($tempfile, $img_str);
$mime = image_type_to_mime_type(exif_imagetype($tempfile));
$mime = mime_content_type($tempfile);
unlink($tempfile);
if (substr($mime, 0, 6) == "image/") {

2
twitter/twitter.php
View File

@ -1724,7 +1724,7 @@ function twitter_fetchhometimeline(App $a, $uid)
$postarray = twitter_createpost($a, $uid, $post, $self, false, false, false);
if (trim($postarray['body']) == "") {
if (empty($postarray['body'])) {
continue;
}