Commit dc495a52 authored by mmn's avatar mmn

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

Merge commit 'refs/merge-requests/39' of https://gitorious.org/social/mainline into merge-requests/39
parents 55321af4 74d4e2fa
......@@ -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);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment