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
commit dc495a52ea

View File

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