Merge remote-tracking branch 'upstream/master' into social-master

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

diff --cc actions/foaf.php
Simple merge

diff --cc actions/shownotice.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc lib/attachmentlist.php
Simple merge

diff --cc lib/default.php
Simple merge

diff --cc lib/util.php
Simple merge

diff --cc plugins/OStatus/OStatusPlugin.php
Simple merge

diff --cc plugins/OStatus/classes/Ostatus_profile.php
Simple merge

diff --cc plugins/OStatus/lib/salmonaction.php
index ef6099c883886bb692a2b01aab34ef8bb1ba80c8,d1293728d2e1076edf83c9a9fb5181ec7802fe38..c8d77a99a689effc6656b8613c4ab8fff07d33ad
--- 1/plugins/OStatus/lib/salmonaction.php
--- 2/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@@ -97,7 -97,8 +97,8 @@@ class SalmonAction extends Actio
          assert($this->activity instanceof Activity);
          assert($this->target instanceof Profile);
  
 -        common_log(LOG_DEBUG, "Got a " . $this->activity->verb);
 +        common_debug('Got a ' . $this->activity->verb);
+ 
          try {
              $options = [ 'source' => 'ostatus' ];
              common_debug('Save salmon slap directly with Notice::saveActivity for actor=='.$this->actor->getID());

diff --cc plugins/OpenID/actions/openidserver.php
Simple merge

diff --cc plugins/RegisterThrottle/RegisterThrottlePlugin.php
Simple merge

diff --cc plugins/WebFinger/WebFingerPlugin.php
index 1edc3d8971351790ac70f9fc22418800814a6237,d902947d934da0c59ffc441c387cf6d8e1db06de..942eab27cfe4394d77b69d66559b21e67ce4ce43
--- 1/plugins/WebFinger/WebFingerPlugin.php
--- 2/plugins/WebFinger/WebFingerPlugin.php
+++ b/plugins/WebFinger/WebFingerPlugin.php
@@@ -141,11 -162,11 +162,11 @@@ class WebFingerPlugin extends Plugi
      /**
       * Add a link header for LRDD Discovery
       */
 -    public function onStartShowHTML($action)
 +    public function onStartShowHTML(Action $action)
      {
          if ($action instanceof ShowstreamAction) {
-             $acct = 'acct:'. $action->getTarget()->getNickname() .'@'. common_config('site', 'server');
-             $url = common_local_url('webfinger') . '?resource='.$acct;
+             $resource = $action->getTarget()->getUri();
+             $url = common_local_url('webfinger') . '?resource='.urlencode($resource);
  
              foreach (array(Discovery::JRD_MIMETYPE, Discovery::XRD_MIMETYPE) as $type) {
                  header('Link: <'.$url.'>; rel="'. Discovery::LRDD_REL.'"; type="'.$type.'"', false);