Issue 6168: "redir" now mostly use OWA

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

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 9c57d624f89356d670c7e4f202d740282110ac95..f4e3d1d43c55d433f875b840a781dac3171bceb4 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -164,7 +164,7 @@ class Probe
                        }
                }
 
-               self::$baseurl = "http://".$host;
+               self::$baseurl = $host_url;
 
                Logger::log("Probing successful for ".$host, Logger::DEBUG);
 
@@ -347,7 +347,7 @@ class Probe
                        $data['url'] = $uri;
                }
 
-               if (x($data, 'photo')) {
+               if (!empty($data['photo'])) {
                        $data['baseurl'] = Network::getUrlMatch(Strings::normaliseLink(defaults($data, 'baseurl', '')), Strings::normaliseLink($data['photo']));
                } else {
                        $data['photo'] = System::baseUrl() . '/images/person-300.jpg';
@@ -358,7 +358,7 @@ class Probe
                                $data['name'] = $data['nick'];
                        }
 
-                       if (!x($data, 'name')) {
+                       if (empty($data['name'])) {
                                $data['name'] = $data['url'];
                        }
                }