summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-03-08 22:53:43 +0000
committerZach Copley <zach@status.net>2010-03-08 23:12:15 +0000
commit691c88bce8fa37d1d371988857645b6cdd9994d9 (patch)
treead444f83a2d0cc6740bcab1c645c493e9d0491b0
parent0d66dc543d368092de08b49857c67248210d8d84 (diff)
Only allow RSSCloud subs to canonical RSS2 profile feeds
-rw-r--r--plugins/RSSCloud/RSSCloudRequestNotify.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/RSSCloud/RSSCloudRequestNotify.php b/plugins/RSSCloud/RSSCloudRequestNotify.php
index d76c08d37..030529534 100644
--- a/plugins/RSSCloud/RSSCloudRequestNotify.php
+++ b/plugins/RSSCloud/RSSCloudRequestNotify.php
@@ -270,13 +270,14 @@ class RSSCloudRequestNotifyAction extends Action
function userFromFeed($feed)
{
- // We only do profile feeds
+ // We only do canonical RSS2 profile feeds (specified by ID), e.g.:
+ // http://www.example.com/api/statuses/user_timeline/2.rss
$path = common_path('api/statuses/user_timeline/');
- $valid = '%^' . $path . '(?<nickname>.*)\.rss$%';
+ $valid = '%^' . $path . '(?<id>.*)\.rss$%';
if (preg_match($valid, $feed, $matches)) {
- $user = User::staticGet('nickname', $matches['nickname']);
+ $user = User::staticGet('id', $matches['id']);
if (!empty($user)) {
return $user;
}