Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

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

diff --git a/lib/api.php b/lib/api.php
index b4803fe62de5e0f3e02b3709d28fc6c94b4a6339..7d94eaee4eda1de4a8e7750106afc19e3afe262e 100644 (file)
--- a/lib/api.php
+++ b/lib/api.php
@@ -289,7 +289,7 @@ class ApiAction extends Action
 
             foreach ($attachments as $attachment) {
                 $enclosure_o=$attachment->getEnclosure();
-                if ($attachment_enclosure) {
+                if ($enclosure_o) {
                     $enclosure = array();
                     $enclosure['url'] = $enclosure_o->url;
                     $enclosure['mimetype'] = $enclosure_o->mimetype;
@@ -299,7 +299,7 @@ class ApiAction extends Action
             }
         }
 
-        if ($include_user) {
+        if ($include_user && $profile) {
             # Don't get notice (recursive!)
             $twitter_user = $this->twitterUserArray($profile, false);
             $twitter_status['user'] = $twitter_user;
@@ -1250,10 +1250,27 @@ class ApiAction extends Action
         case 'api':
             break;
         default:
+
+            $name = null;
+            $url  = null;
+
             $ns = Notice_source::staticGet($source);
+
             if ($ns) {
-                $source_name = '<a href="' . $ns->url . '">' . $ns->name . '</a>';
+                $name = $ns->name;
+                $url  = $ns->url;
+            } else {
+                $app = Oauth_application::staticGet('name', $source);
+                if ($app) {
+                    $name = $app->name;
+                    $url  = $app->source_url;
+                }
+            }
+
+            if (!empty($name) && !empty($url)) {
+                $source_name = '<a href="' . $url . '">' . $name . '</a>';
             }
+
             break;
         }
         return $source_name;