bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #8740 from MrPetovan/task/frio-improve-share-display

Browse source 
[frio] Improve share blocks display
This commit is contained in:
Michael Vogel 2020-06-11 07:32:29 +02:00 • committed by GitHub
commit 9b85d0b16e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 228 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Network/Probe.php
View file

@ -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;
}