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
2016-01-05 23:53:08 +00:00
parent 2c5460eb0e 32549cfd8c
commit d45457e4a9
1 changed files with 1 additions and 0 deletions
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -822,6 +822,7 @@ class Profile extends Managed_DataObject

        $notices = new Notice();
        $notices->profile_id = $this->id;
+        $notices->verb = ActivityVerb::POST;        
        $cnt = (int) $notices->count('distinct id');

        if (!empty($c)) {