tobias/friendica
1
0
Fork 0
Code Pull requests Activity

DFRN: Contact-id is now stored depending on the author/Some more bugfixes

Browse source
This commit is contained in:
Michael Vogel 2016-02-04 12:51:34 +01:00
commit 3a649047df
2 changed files with 41 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/items.php
View file

@ -17,7 +17,7 @@ require_once('include/feed.php');
require_once('include/Contact.php');
require_once('mod/share.php');
require_once('include/enotify.php');
//require_once('include/import-dfrn.php');
require_once('include/import-dfrn.php');
require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
@ -2424,7 +2424,7 @@ function item_is_remote_self($contact, &$datarray) {
function local_delivery($importer,$data) {
// dfrn-Test
//return dfrn2::import($data, $importer);
return dfrn2::import($data, $importer);
require_once('library/simplepie/simplepie.inc');