Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

[quix0rs-gnu-social.git] / scripts / inbox_users.php

diff --git a/scripts/inbox_users.php b/scripts/inbox_users.php
index 0543abb2a33bb46e045699ed78faa711192a2167..7d14f0efe6258fd85e8fd5ac591148ebd0b6a7d3 100755 (executable)
--- a/scripts/inbox_users.php
+++ b/scripts/inbox_users.php
@@ -78,11 +78,12 @@ foreach ($ids as $id) {
                                                        'FROM subscription JOIN notice ON subscription.subscribed = notice.profile_id ' .
                                                        'WHERE subscription.subscriber = ' . $user->id . ' ' .
                                                        'AND notice.created >= subscription.created ' .
-                                                       'AND now() - notice.created < ' . (7 * 24 * 3600) . ' ' .
                                                        'AND NOT EXISTS (SELECT user_id, notice_id ' .
                                                        'FROM notice_inbox ' .
                                                        'WHERE user_id = ' . $user->id . ' ' . 
-                                                       'AND notice_id = notice.id)');
+                                                       'AND notice_id = notice.id) ' .
+                                                       'ORDER BY notice.created DESC ' .
+                                                       'LIMIT 0, 1000');
        
        if (is_null($result) || $result === false) {
                common_log_db_error($inbox, 'INSERT', __FILE__);
@@ -105,5 +106,6 @@ foreach ($ids as $id) {
        
        if ($cache) {
                $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
+               $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id . ';last'));
        }
 }