From d22364b35e33982b2f95146f9ac290a3606da28b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Mon, 14 Dec 2009 17:11:34 -0500
Subject: had the order of <status> and <retweeted_status> wrong in api output

---
 lib/api.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'lib/api.php')

diff --git a/lib/api.php b/lib/api.php
index 833bc1c5f..4ed49e452 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -220,18 +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);
-            if (empty($original)) {
-                return $base;
-            } else {
+            if (!empty($original)) {
                 $original_array = $this->twitterSimpleStatusArray($original, $include_user);
-                $original_array['retweeted_status'] = $base;
-                return $original_array;
+                $base['retweeted_status'] = $original_array;
             }
         }
+
+        return $base;
     }
 
     function twitterSimpleStatusArray($notice, $include_user=true)
-- 
cgit v1.2.3-54-g00ecf