aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-01-27 07:14:55 +0100
committerfabrixxm <fabrix.xm@gmail.com>2011-01-27 07:14:55 +0100
commit444d82a5328433fbe48e18b928d35218905a756c (patch)
tree84bd92072bf37eee3b54ebf7cb9ccaf408562e67 /include/items.php
parent6558ee1e2210fb41b1f4d95f806ee441a565087d (diff)
parentd2dddd995abef2d0805901b278647bef0ce50f88 (diff)
downloadvolse-hubzilla-444d82a5328433fbe48e18b928d35218905a756c.tar.gz
volse-hubzilla-444d82a5328433fbe48e18b928d35218905a756c.tar.bz2
volse-hubzilla-444d82a5328433fbe48e18b928d35218905a756c.zip
Merge branch 'friendika-master'
Diffstat (limited to 'include/items.php')
-rw-r--r--include/items.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php
index b6a588800..e238280fc 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1157,6 +1157,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
continue;
}
$datarray = get_atom_elements($feed,$item);
+
if($contact['network'] === 'stat') {
if(strlen($datarray['title']))
unset($datarray['title']);
@@ -1167,7 +1168,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
);
$datarray['last-child'] = 1;
}
- if(($contact['network'] === 'feed') || (! strlen($contact['poll']))) {
+
+ if(($contact['network'] === 'feed') || (! strlen($contact['notify']))) {
// one way feed - no remote comment ability
$datarray['last-child'] = 0;
}
@@ -1223,7 +1225,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
$datarray['last-child'] = 1;
}
- if(($contact['network'] === 'feed') || (! strlen($contact['poll']))) {
+ if(($contact['network'] === 'feed') || (! strlen($contact['notify']))) {
// one way feed - no remote comment ability
$datarray['last-child'] = 0;
}