Merge branch 'nightly', beginning of 1.2.x

[quix0rs-gnu-social.git] / plugins / WebFinger / lib / webfingerresource.php

diff --git a/plugins/WebFinger/lib/webfingerresource.php b/plugins/WebFinger/lib/webfingerresource.php
index d473d95628f4a73f3ea28068ba3002fc4108e94c..61b2cc09adbedcd81350ed2d82db256aa59fb151 100644 (file)
--- a/plugins/WebFinger/lib/webfingerresource.php
+++ b/plugins/WebFinger/lib/webfingerresource.php
@@ -34,7 +34,12 @@ abstract class WebFingerResource
         $aliases = array();
 
         // Add the URI as an identity, this is _not_ necessarily an HTTP url
-        $aliases[] = $this->object->getUri();
+        $uri = $this->object->getUri();
+        $aliases[] = $uri;
+        if (common_config('webfinger', 'http_alias')
+                && strtolower(parse_url($uri, PHP_URL_SCHEME)) === 'https') {
+            $aliases[] = preg_replace('/^https:/', 'http:', $uri, 1);
+        }
 
         try {
             $aliases[] = $this->object->getUrl();