diff options
author | Brion Vibber <brion@pobox.com> | 2010-05-19 10:59:14 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-05-19 10:59:14 -0700 |
commit | a39a934dd4a133bad6e76fa9a5018cedcb70225c (patch) | |
tree | f82b4248da5447780df322c35ca041956bcd887e /actions/twitapisearchatom.php | |
parent | d0ba34e0f32ac71b552302ec875943e0e9236720 (diff) | |
parent | 74a89b1fc37067d91d31bd66922053361eb4e616 (diff) |
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'actions/twitapisearchatom.php')
-rw-r--r-- | actions/twitapisearchatom.php | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php index 24aa619bd..51e8a8881 100644 --- a/actions/twitapisearchatom.php +++ b/actions/twitapisearchatom.php @@ -342,10 +342,24 @@ class TwitapisearchatomAction extends ApiAction 'rel' => 'related', 'href' => $profile->avatarUrl())); - // TODO: Here is where we'd put in a link to an atom feed for threads + // @todo: Here is where we'd put in a link to an atom feed for threads + + $source = null; + + $ns = $notice->getSource(); + if ($ns) { + if (!empty($ns->name) && !empty($ns->url)) { + $source = '<a href="' + . htmlspecialchars($ns->url) + . '" rel="nofollow">' + . htmlspecialchars($ns->name) + . '</a>'; + } else { + $source = $ns->code; + } + } - $this->element("twitter:source", null, - htmlentities($this->sourceLink($notice->source))); + $this->element("twitter:source", null, $source); $this->elementStart('author'); |