add version information to MemcachePlugin

[quix0rs-gnu-social.git] / lib / api.php

diff --git a/lib/api.php b/lib/api.php
index 0c66501116313226159841ae8cd1d956eeff2b7f..4ed49e45293197f790d167f9a8da24e882ce4b98 100644 (file)
--- a/lib/api.php
+++ b/lib/api.php
@@ -220,14 +220,15 @@ class ApiAction extends Action
     {
         $base = $this->twitterSimpleStatusArray($notice, $include_user);
 
-        if (empty($notice->repeat_of)) {
-            return $base;
-        } else {
+        if (!empty($notice->repeat_of)) {
             $original = Notice::staticGet('id', $notice->repeat_of);
-            $original_array = $this->twitterSimpleStatusArray($original, $include_user);
-            $original_array['retweeted_status'] = $base;
-            return $original_array;
+            if (!empty($original)) {
+                $original_array = $this->twitterSimpleStatusArray($original, $include_user);
+                $base['retweeted_status'] = $original_array;
+            }
         }
+
+        return $base;
     }
 
     function twitterSimpleStatusArray($notice, $include_user=true)