clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into item-abstraction

This commit is contained in:
Michael 2018-06-17 06:23:56 +00:00
parent 392bb7d5aa 6b77771343
commit b41bb3adfb
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
twitter/twitter.php
View File

@ -75,7 +75,6 @@ use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\ItemContent; use Friendica\Model\ItemContent;
use Friendica\Model\Photo;
use Friendica\Model\Queue; use Friendica\Model\Queue;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Object\Image; use Friendica\Object\Image;
@ -1486,7 +1485,7 @@ function twitter_createpost(App $a, $uid, $post, $self, $create_user, $only_exis
return $postarray; 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); 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; break;
} }
if (!count($post)) { if (empty($post)) {
logger("twitter_fetchparentposts: Can't fetch post " . $parameters->id, LOGGER_DEBUG); logger("twitter_fetchparentposts: Can't fetch post " . $parameters->id, LOGGER_DEBUG);
break; break;
} }