diff options
Diffstat (limited to 'include/feedutils.php')
| -rw-r--r-- | include/feedutils.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/feedutils.php b/include/feedutils.php index b21495d72..fbd97b598 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -1060,6 +1060,8 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { return; } + + $sys_expire = intval(get_config('system', 'default_expire_days')); $chn_expire = intval($importer['channel_expire_days']); @@ -1353,7 +1355,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { } } - if(! post_is_importable($datarray, $contact)) + if(! post_is_importable($importer['channel_id'], $datarray, $contact)) continue; $datarray['parent_mid'] = $datarray['mid']; @@ -1509,7 +1511,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) { } } - if(! post_is_importable($datarray, $contact)) + if(! post_is_importable($importer['channel_id'], $datarray, $contact)) continue; logger('author: ' . print_r($author, true), LOGGER_DEBUG); @@ -1764,8 +1766,8 @@ function handle_feed($uid, $abook_id, $url) { //logger('data:' . print_r($z, true), LOGGER_DATA); if($z['success']) { - consume_feed($z['body'], $channel, $x[0], 1); - consume_feed($z['body'], $channel, $x[0], 2); + consume_feed($z['body'], $channel, $x, 1); + consume_feed($z['body'], $channel, $x, 2); return true; } |