From 74d4e2fa10f8dc5bbe2b8a6298d0b8ddf5eecb02 Mon Sep 17 00:00:00 2001
From: Chimo <chimo@chromic.org>
Date: Sun, 8 Feb 2015 20:11:50 -0500
Subject: [PATCH] TwitterBridge: don't array_merge() non-arrays

Fixes: ErrorException: [2] array_merge(): Argument #2 is not an array
---
 plugins/TwitterBridge/daemons/synctwitterfriends.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/TwitterBridge/daemons/synctwitterfriends.php b/plugins/TwitterBridge/daemons/synctwitterfriends.php
index 8b8ffbfd49..a3862eedfd 100755
--- 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);
+                }
             }
         }