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

object/Item.php

@@ -349,7 +349,7 @@ class Item extends BaseObject {
 
 		// Diaspora isn't able to do likes on comments - but red does
 		if (($item["item_network"] == NETWORK_DIASPORA) AND ($indent == 'comment') AND
-			!diaspora::is_redmatrix($item["owner-link"]) AND isset($buttons["like"])) {
+			!Diaspora::is_redmatrix($item["owner-link"]) AND isset($buttons["like"])) {
 			unset($buttons["like"]);
 		}