Merge branch 'nightly' into 'nightly'

only count post-notices (i.e. don't include activity-notices in statuses_count in the API)



See merge request !73
This commit is contained in:
mmn 2016-01-05 23:53:08 +00:00
commit d45457e4a9

View File

@ -822,6 +822,7 @@ class Profile extends Managed_DataObject
$notices = new Notice(); $notices = new Notice();
$notices->profile_id = $this->id; $notices->profile_id = $this->id;
$notices->verb = ActivityVerb::POST;
$cnt = (int) $notices->count('distinct id'); $cnt = (int) $notices->count('distinct id');
if (!empty($c)) { if (!empty($c)) {