Merge branch 'pull'

[friendica.git] / include / poller.php

diff --git a/include/poller.php b/include/poller.php
index 89a3408ec90efcf04deca6aa7f5e1dd00afecee2..cef0647b596f50de31f6c6f49454deb38f37de96 100644 (file)
--- a/include/poller.php
+++ b/include/poller.php
@@ -50,12 +50,15 @@ function poller_run($argv, $argc){
 
        
 
-       // once daily run expire in background
+       // once daily run birthday_updates and then expire in background
 
        $d1 = get_config('system','last_expire_day');
        $d2 = intval(datetime_convert('UTC','UTC','now','d'));
 
        if($d2 != intval($d1)) {
+
+               update_contact_birthdays();
+
                set_config('system','last_expire_day',$d2);
                proc_run('php','include/expire.php');
        }
@@ -486,11 +489,11 @@ function poller_run($argv, $argc){
                                }
 
 
-                               consume_feed($xml,$importer,$contact,$hub,1, true);
+                               consume_feed($xml,$importer,$contact,$hub,1,1);
 
                                // do it twice. Ensures that children of parents which may be later in the stream aren't tossed
        
-                               consume_feed($xml,$importer,$contact,$hub,1);
+                               consume_feed($xml,$importer,$contact,$hub,1,2);
 
                                $hubmode = 'subscribe';
                                if($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly'])