From: Chimo <chimo@chromic.org>
Date: Mon, 9 Feb 2015 01:11:50 +0000 (-0500)
Subject: TwitterBridge: don't array_merge() non-arrays
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=74d4e2fa10f8dc5bbe2b8a6298d0b8ddf5eecb02;p=quix0rs-gnu-social.git

TwitterBridge: don't array_merge() non-arrays

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

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);
+                }
             }
         }