Merge pull request #10801 from annando/network-thread-view

[friendica.git] / src / Core / Addon.php

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 511364b8acb0cff9bb6180e97d6dd8441bea288b..a1b35471f8d162f23fddfe10946a3a788830337f 100644 (file)
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,6 +23,7 @@ namespace Friendica\Core;
 
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Util\Strings;
 
 /**
@@ -236,9 +237,9 @@ class Addon
                        return $info;
                }
 
-               $stamp1 = microtime(true);
+               DI::profiler()->startRecording('file');
                $f = file_get_contents("addon/$addon/$addon.php");
-               DI::profiler()->saveTimestamp($stamp1, "file");
+               DI::profiler()->stopRecording();
 
                $r = preg_match("|/\*.*\*/|msU", $f, $m);
 
@@ -257,6 +258,12 @@ class Addon
                                        if ($type == "author" || $type == "maintainer") {
                                                $r = preg_match("|([^<]+)<([^>]+)>|", $v, $m);
                                                if ($r) {
+                                                       if (!empty($m[2]) && empty(parse_url($m[2], PHP_URL_SCHEME))) {
+                                                               $contact = Contact::getByURL($m[2], false);
+                                                               if (!empty($contact['url'])) {
+                                                                       $m[2] = $contact['url'];
+                                                               }
+                                                       }
                                                        $info[$type][] = ['name' => $m[1], 'link' => $m[2]];
                                                } else {
                                                        $info[$type][] = ['name' => $v];