Commit 500ec79e authored by Zach Copley's avatar Zach Copley

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

* '1.0.x' of gitorious.org:statusnet/mainline:
  add conversation ID to notice output
  For fave count, don't use distinct
  Static -> static
  allow posting to groups through atompub
parents eaaa978d 00be5882
......@@ -447,7 +447,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction
} else {
$group = User_group::staticGet('uri', $uri);
if (!empty($group)) {
$options['groups'][] = $uri;
$options['groups'][] = $group->id;
} else {
// @fixme: hook for discovery here
common_log(LOG_WARNING, sprintf('AtomPub post with unknown attention URI %s', $uri));
......
......@@ -778,7 +778,7 @@ class Profile extends Managed_DataObject
$faves = new Fave();
$faves->user_id = $this->id;
$cnt = (int) $faves->count('distinct notice_id');
$cnt = (int) $faves->count('notice_id');
if (!empty($c)) {
$c->set(Cache::key('profile:fave_count:'.$this->id), $cnt);
......
......@@ -376,6 +376,7 @@ class ApiAction extends Action
// StatusNet-specific
$twitter_status['statusnet_html'] = $notice->rendered;
$twitter_status['statusnet_conversation_id'] = $notice->conversation;
return $twitter_status;
}
......
......@@ -63,7 +63,7 @@ class User_openid extends Memcached_DataObject
return array(false, false, false);
}
Static function hasOpenID($user_id)
static function hasOpenID($user_id)
{
$oid = new User_openid();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment