forked from GNUsocial/gnu-social
TwitterBridge: don't array_merge() non-arrays
Fixes: ErrorException: [2] array_merge(): Argument #2 is not an array
This commit is contained in:
parent
8616055959
commit
74d4e2fa10
@ -183,9 +183,11 @@ class SyncTwitterFriendsDaemon extends ParallelizingDaemon
|
|||||||
"of Twitter user $flink->foreign_id friends.");
|
"of Twitter user $flink->foreign_id friends.");
|
||||||
continue;
|
continue;
|
||||||
} else {
|
} else {
|
||||||
|
if (is_array($more_friends)) {
|
||||||
$friends = array_merge($friends, $more_friends);
|
$friends = array_merge($friends, $more_friends);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return $friends;
|
return $friends;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user