GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge commit 'refs/merge-requests/39' of https://gitorious.org/social/mainline into merge-requests/39

This commit is contained in:
Mikael Nordfeldth 2015-02-09 11:35:19 +01:00
parent 55321af4c8 74d4e2fa10
commit dc495a52ea
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/TwitterBridge/daemons/synctwitterfriends.php
View File

@ -183,7 +183,9 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon
"of Twitter user $flink->foreign_id friends.");
continue;
} else {
$friends = array_merge($friends, $more_friends);
if (is_array($more_friends)) {
$friends = array_merge($friends, $more_friends);
}
}
}