TwitterBridge: don't array_merge() non-arrays

Fixes: ErrorException: [2] array_merge(): Argument #2 is not an array

TwitterBridge: don't array_merge() non-arrays
Fixes: ErrorException: [2] array_merge(): Argument #2 is not an array
74d4e2fa · Chimo · 86160559 · 74d4e2fa
Commit 74d4e2fa authored Feb 08, 2015 by Chimo
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

plugins/TwitterBridge/daemons/synctwitterfriends.php plugins/TwitterBridge/daemons/synctwitterfriends.php +3 -1

No files found.
--- a/plugins/TwitterBridge/daemons/synctwitterfriends.php
+++ b/plugins/TwitterBridge/daemons/synctwitterfriends.php
@@ -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);
+                }
            }
        }