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

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

Conflicts:
	include/diaspora.php
	object/Item.php

include/follow.php

@@ -293,8 +293,9 @@ function new_contact($uid,$url,$interactive = false) {
 			$slap = ostatus::salmon($item, $r[0]);
 			slapper($r[0], $contact['notify'], $slap);
 		}
+
 		if ($contact['network'] == NETWORK_DIASPORA) {
-			$ret = diaspora::send_share($a->user,$contact);
+			$ret = Diaspora::send_share($a->user,$contact);
 			logger('share returns: '.$ret);
 		}
 	}