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

diff --cc mod/display.php
index fd508fcfc217cc08e2673e0e9d76abb285793d5d,4a48eb839cab3375dbee34be6432e08a50cc856d..41c4cc3b9a8a2683fa771c20f892342c3c6f5759
--- 1/mod/display.php
--- 2/mod/display.php
+++ b/mod/display.php
@@@ -123,9 -122,11 +122,9 @@@ function display_init(App $a
  
  function display_fetchauthor($item)
  {
 -      if (Diaspora::isReshare($item['body'], true)) {
 -              $shared = Item::getShareArray($item);
 -              if (!empty($shared['profile'])) {
 -                      $contact = Contact::getByURLForUser($shared['profile'], DI::userSession()->getLocalUserId());
 -              }
 +      $shared = Item::getShareArray($item);
 +      if (empty($shared['comment']) && !empty($shared['guid']) && !empty($shared['profile'])) {
-               $contact = Contact::getByURLForUser($shared['profile'], Session::getLocalUser());
++              $contact = Contact::getByURLForUser($shared['profile'], DI::userSession()->getLocalUserId());
        }
  
        if (empty($contact)) {

diff --cc mod/share.php
Simple merge

diff --cc src/Content/Item.php
Simple merge

diff --cc src/Model/Contact.php
Simple merge

diff --cc src/Model/Item.php
Simple merge