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

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

diff --cc boot.php
Simple merge

diff --cc include/diaspora.php
index 4076059c7cd21a36b48338dc74071b9fb8eed333,fbfc497b59e383940382bdf0e9ea3aaa44d0c652..db2cca471bcad6cf6a81f4b7f72befa6f3fbab60
--- 1/include/diaspora.php
--- 2/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.

diff --cc include/event.php
Simple merge

diff --cc object/Item.php
Simple merge