Merge branch '0.9.x' into cacheplugin

[quix0rs-gnu-social.git] / classes / Notice_inbox.php

diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php
index b39006542c2a65943e2ae370d591a99e3d3314d0..d3ddad656a7aae8492f1bee4d80afd3959193b92 100644 (file)
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -106,6 +106,13 @@ class Notice_inbox extends Memcached_DataObject
         return Memcached_DataObject::pkeyGet('Notice_inbox', $kv);
     }
 
+    /**
+     * Trim inbox for a given user to latest NOTICE_INBOX_LIMIT items
+     * (up to NOTICE_INBOX_GC_MAX will be deleted).
+     *
+     * @param int $user_id
+     * @return int count of notices dropped from the inbox, if any
+     */
     static function gc($user_id)
     {
         $entry = new Notice_inbox();
@@ -133,6 +140,8 @@ class Notice_inbox extends Memcached_DataObject
                 $notices = array();
             }
         }
+
+        return $total;
     }
 
     static function deleteMatching($user_id, $notices)