diff options
| author | Evan Prodromou <evan@status.net> | 2009-10-31 14:47:21 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-10-31 14:47:21 -0400 |
| commit | 44ce8e2fcd1eba0d0f2723c246c1a021614e2763 (patch) | |
| tree | eacb1d8470354e7f7d55b0ca185690acf45cecd7 /classes | |
| parent | bed942271d772e6eed36c4c012c48460510564f1 (diff) | |
| parent | 8a333805df5fc3786ef8abe1d71421fb9270ff7f (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Notice.php | 7 | ||||
| -rw-r--r-- | classes/statusnet.ini | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index c08a66790..a9dbaa461 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1181,10 +1181,9 @@ class Notice extends Memcached_DataObject $xs->element('link', array('href' => $profile->profileurl)); $user = User::staticGet('id', $profile->id); if (!empty($user)) { - $atom_feed = common_local_url('api', - array('apiaction' => 'statuses', - 'method' => 'user_timeline', - 'argument' => $profile->nickname.'.atom')); + $atom_feed = common_local_url('ApiTimelineUser', + array('format' => 'atom', + 'id' => $profile->nickname)); $xs->element('link', array('rel' => 'self', 'type' => 'application/atom+xml', 'href' => $profile->profileurl)); diff --git a/classes/statusnet.ini b/classes/statusnet.ini index 7931c7bcd..623790b10 100644 --- a/classes/statusnet.ini +++ b/classes/statusnet.ini @@ -537,6 +537,16 @@ modified = 384 canonical = K display = U +[user_openid_trustroot] +trustroot = 130 +user_id = 129 +created = 142 +modified = 384 + +[user_openid__keys] +trustroot = K +user_id = K + [user_role] user_id = 129 role = 130 |