diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index f615eda23..862a75b54 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -1203,7 +1203,10 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp $reply->cc = $post->cc; } - $reply->to = $post->to; + 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]"; } diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 63579af86..bd7800d86 100644 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -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/") { diff --git a/twitter/twitter.php b/twitter/twitter.php index b9b3d08ec..74828a842 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -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; }