strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse source 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
This commit is contained in:
Roland Häder 2016-12-22 11:29:56 +01:00
commit c0df692f5f
16 changed files with 176 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/Contact.php
View file

@ -106,7 +106,7 @@ function terminate_friendship($user,$self,$contact) {
}
elseif($contact['network'] === NETWORK_DIASPORA) {
require_once('include/diaspora.php');
diaspora::send_unshare($user,$contact);
Diaspora::send_unshare($user,$contact);
}
elseif($contact['network'] === NETWORK_DFRN) {
require_once('include/dfrn.php');