From 2ad5aece55fed8fb4242961bcb301ad33ae7ca38 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@e14n.com>
Date: Tue, 4 Jun 2013 15:20:21 -0400
Subject: [PATCH] Better handling of multiple objects

---
 lib/activity.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/activity.php b/lib/activity.php
index 3b7a4d2aaa..592c56bcbd 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -375,11 +375,12 @@ class Activity
 
         // object
 
-        if (count($this->objects) > 1) {
-            common_log(LOG_WARNING, "Ignoring extra objects in JSON output for activity " . $this->id);
-        } else if (count($this->objects == 0)) {
+        if (count($this->objects) == 0) {
             common_log(LOG_ERR, "Can't save " . $this->id);
         } else {
+            if (count($this->objects) > 1) {
+                common_log(LOG_WARNING, "Ignoring " . (count($this->objects) - 1) . " extra objects in JSON output for activity " . $this->id);
+            }
             $object = $this->objects[0];
 
             if ($object instanceof Activity) {