diff options
author | Sarven Capadisli <csarven@status.net> | 2010-02-04 16:56:34 +0000 |
---|---|---|
committer | Sarven Capadisli <csarven@status.net> | 2010-02-04 16:56:34 +0000 |
commit | 7ebd13fa69d2a5dac8bc59799281d3d6e017eeae (patch) | |
tree | 605267bbe7c902d7a71766cdeb523bfbb266a0f9 /lib/api.php | |
parent | 339eb1adadc7f3495ad31ef0a5cf20cdca47ce1f (diff) | |
parent | 9e940445f1ab1ec53f3bad14a1a94dc2064d0ee6 (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/api.php')
-rw-r--r-- | lib/api.php | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/lib/api.php b/lib/api.php index 825262b4c..7d94eaee4 100644 --- a/lib/api.php +++ b/lib/api.php @@ -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; |