Merge remote-tracking branch 'upstream/develop' into item-abstraction
This commit is contained in:
commit
b41bb3adfb
|
@ -75,7 +75,6 @@ use Friendica\Model\Contact;
|
|||
use Friendica\Model\Group;
|
||||
use Friendica\Model\Item;
|
||||
use Friendica\Model\ItemContent;
|
||||
use Friendica\Model\Photo;
|
||||
use Friendica\Model\Queue;
|
||||
use Friendica\Model\User;
|
||||
use Friendica\Object\Image;
|
||||
|
@ -1486,7 +1485,7 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
|
|||
return $postarray;
|
||||
}
|
||||
|
||||
function twitter_fetchparentposts(App $a, $uid, $post, $connection, $self, $own_id)
|
||||
function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection, $self, $own_id)
|
||||
{
|
||||
logger("twitter_fetchparentposts: Fetching for user " . $uid . " and post " . $post->id_str, LOGGER_DEBUG);
|
||||
|
||||
|
@ -1502,7 +1501,7 @@ function twitter_fetchparentposts(App $a, $uid, $post, $connection, $self, $own_
|
|||
break;
|
||||
}
|
||||
|
||||
if (!count($post)) {
|
||||
if (empty($post)) {
|
||||
logger("twitter_fetchparentposts: Can't fetch post " . $parameters->id, LOGGER_DEBUG);
|
||||
break;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user