aboutsummaryrefslogtreecommitdiffstats
path: root/include/feedutils.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2022-03-01 10:14:05 +0000
committerMario <mario@mariovavti.com>2022-03-01 10:14:05 +0000
commit01b9f2dfcf3b23dcbf1dff06e7e42397840594a9 (patch)
treedfc971f5c51477cb7705c0e0e7a7c3945c7ceb85 /include/feedutils.php
parent0cc6f66a26181319738db8150074f62b3684f97e (diff)
downloadvolse-hubzilla-01b9f2dfcf3b23dcbf1dff06e7e42397840594a9.tar.gz
volse-hubzilla-01b9f2dfcf3b23dcbf1dff06e7e42397840594a9.tar.bz2
volse-hubzilla-01b9f2dfcf3b23dcbf1dff06e7e42397840594a9.zip
enhanced content filters
Diffstat (limited to 'include/feedutils.php')
-rw-r--r--include/feedutils.php10
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;
}