Merge pull request #8765 from annando/fix-pubkey

[friendica.git] / src / Network / Probe.php

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 71d676236dd5b876abfb235df1c8bbc4f5d32055..dcb0bf192f68b84a0574e3f9e5a79129fe18ab80 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -441,7 +441,7 @@ class Probe
                        }
                }
 
-               if (!empty(self::$baseurl)) {
+               if (empty($data['baseurl']) && !empty(self::$baseurl)) {
                        $data['baseurl'] = self::$baseurl;
                }
 
@@ -736,13 +736,6 @@ class Probe
 
                Logger::log($uri." is ".$result["network"], Logger::DEBUG);
 
-               if (empty($result["baseurl"]) && ($result["network"] != Protocol::PHANTOM)) {
-                       $pos = strpos($result["url"], $host);
-                       if ($pos) {
-                               $result["baseurl"] = substr($result["url"], 0, $pos).$host;
-                       }
-               }
-
                return $result;
        }