From: Roland Haeder <roland@mxchange.org>
Date: Sat, 31 Dec 2016 16:59:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9ca789b9529dceedc35f637804179e1034b3f1d9;p=friendica.git

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

Signed-off-by: Roland Haeder <roland@mxchange.org>
---

9ca789b9529dceedc35f637804179e1034b3f1d9
diff --cc include/diaspora.php
index 4076059c7c,fbfc497b59..db2cca471b
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@@ -2443,10 -2477,9 +2478,10 @@@ class Diaspora 
  	 *
  	 * @return string the handle in the format user@domain.tld
  	 */
- 	private function my_handle($contact) {
+ 	private static function my_handle($contact) {
 -		if ($contact["addr"] != "")
 +		if ($contact["addr"] != "") {
  			return $contact["addr"];
 +		}
  
  		// Normally we should have a filled "addr" field - but in the past this wasn't the case
  		// So - just in case - we build the the address here.