diff options
author | Evan Prodromou <evan@status.net> | 2010-03-09 10:57:38 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-03-09 10:57:38 -0500 |
commit | 3f1a9443d9fc8c6f519913b6014eec814248eea4 (patch) | |
tree | fe2f561d302ad60e507d789c3f782a514f13ce77 /plugins/RSSCloud/RSSCloudRequestNotify.php | |
parent | 61434ebaa291ebd11cd1423ec36bb66073d55a74 (diff) | |
parent | d644f4148b5856c55ecc3770552c330d5f33348c (diff) |
Merge branch 'master' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'plugins/RSSCloud/RSSCloudRequestNotify.php')
-rw-r--r-- | plugins/RSSCloud/RSSCloudRequestNotify.php | 7 |
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; } |