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

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

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:33:00 +01:00
parent 5d0db51fdf 9e689e8b9b
commit ad20c5504d
16 changed files with 174 additions and 85 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');