summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-05-06 00:55:17 -0700
committerZach Copley <zach@status.net>2010-05-06 21:48:12 +0000
commit209fd12cd033c62619c68ac17a4fa70b1e981169 (patch)
tree77b9f0bc37b5055855855543dfd28ac9d04581c0
parent292ea33dbddeee881474b8f98507213a7d8c159c (diff)
HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them
-rw-r--r--actions/twitapisearchatom.php2
-rw-r--r--lib/apiaction.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/actions/twitapisearchatom.php b/actions/twitapisearchatom.php
index 3eb54ccc3..6c740c490 100644
--- a/actions/twitapisearchatom.php
+++ b/actions/twitapisearchatom.php
@@ -349,7 +349,7 @@ class TwitapisearchatomAction extends ApiAction
$ns = $notice->getSource();
if ($ns) {
if (!empty($ns->name) && !empty($ns->url)) {
- $source = '<a href="' . $ns->url . '">' . $ns->name . '</a>';
+ $source = '<a href="' . $ns->url . '" rel="nofollow">' . $ns->name . '</a>';
} else {
$source = $ns->code;
}
diff --git a/lib/apiaction.php b/lib/apiaction.php
index 8c4dc6c26..2608be227 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -319,13 +319,13 @@ class ApiAction extends Action
$ns = $notice->getSource();
if ($ns) {
if (!empty($ns->name) && !empty($ns->url)) {
- $source = '<a href="' . $ns->url . '">' . $ns->name . '</a>';
+ $source = '<a href="' . $ns->url . '" rel="nofollow">' . $ns->name . '</a>';
} else {
$source = $ns->code;
}
}
- $twitter_status['source'] = $source;
+ $twitter_status['source'] = htmlentities($source);
$twitter_status['id'] = intval($notice->id);
$replier_profile = null;