aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-02-12 18:31:13 +0100
committerfabrixxm <fabrix.xm@gmail.com>2011-02-12 18:31:13 +0100
commit53dff2204bf2cbe46b6cbdb7174fa0cf1a7162b1 (patch)
treeeee6bc94d474e327a233c7053beb46d33036a65d /include/items.php
parent26dfb73f48d4fcd4671d136e53f52bb81995ea34 (diff)
parent89cbd17c721dae57b18686fd7f3e5f8c74a279d9 (diff)
downloadvolse-hubzilla-53dff2204bf2cbe46b6cbdb7174fa0cf1a7162b1.tar.gz
volse-hubzilla-53dff2204bf2cbe46b6cbdb7174fa0cf1a7162b1.tar.bz2
volse-hubzilla-53dff2204bf2cbe46b6cbdb7174fa0cf1a7162b1.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 cffd13a01..b5bdd7833 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1128,15 +1128,16 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
}
if(($is_reply) && is_array($contact)) {
-
+
// Have we seen it? If not, import it.
$item_id = $item->get_id();
-
+
$r = q("SELECT `uid`, `last-child`, `edited` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item_id),
intval($importer['uid'])
);
+
// FIXME update content if 'updated' changes
if(count($r)) {
$allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
@@ -1155,6 +1156,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) {
}
continue;
}
+
$datarray = get_atom_elements($feed,$item);
$force_parent = false;
if($contact['network'] === 'stat') {