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

[friendica.git] / src / Content / ContactSelector.php

diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php
index 38227bc6e23a6dfb3ab9f17592a5446427fc547e..ec7bcab95cc53adb6b323778dee314a063d3abc4 100644 (file)
--- a/src/Content/ContactSelector.php
+++ b/src/Content/ContactSelector.php
@@ -1,7 +1,24 @@
 <?php
 /**
- * @file src/Content/ContactSelector.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 namespace Friendica\Content;
 
 use Friendica\Core\Hook;
@@ -59,14 +76,6 @@ class ContactSelector
                        $server_url = Strings::normaliseLink($contact['baseurl']);
                }
 
-               if (empty($server_url)) {
-                       // Fetch the server url from the gcontact table
-                       $gcontact = DBA::selectFirst('gcontact', ['server_url'], ['nurl' => Strings::normaliseLink($profile)]);
-                       if (!empty($gcontact) && !empty($gcontact['server_url'])) {
-                               $server_url = Strings::normaliseLink($gcontact['server_url']);
-                       }
-               }
-
                if (empty($server_url)) {
                        // Create the server url out of the profile url
                        $parts = parse_url($profile);