clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Feed should work now as well

Browse Source
This commit is contained in:
Michael Vogel
2016-02-04 23:52:06 +01:00
parent 92a31344b5
commit 2bd36e5628
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/items.php
View File

@@ -1695,11 +1695,9 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
}
return;
}
// dfrn-test
/*
if ($contact['network'] === NETWORK_DFRN) {
logger("Consume DFRN messages", LOGGER_DEBUG);
logger("dfrn-test");
$r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
`contact`.`pubkey` AS `cpubkey`,
@@ -1711,14 +1709,15 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
FROM `contact`
LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `contact`.`id` = %d AND `user`.`uid` = %d",
dbesc($contact["id"], $importer["uid"]);
dbesc($contact["id"]), dbesc($importer["uid"])
);
if ($r) {
logger("Now import the DFRN feed");
dfrn2::import($xml,$r[0], true);
return;
}
}
*/
// Test - remove before flight
//if ($pass < 2) {
// $tempfile = tempnam(get_temppath(), "dfrn-consume-");