clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve test behaviour

Browse Source
This commit is contained in:
Michael
2018-07-08 05:29:06 +00:00
parent 271b6cb8f9
commit 69db696ab1
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/App.php
View File

@@ -412,11 +412,17 @@ class App
public function set_baseurl($url)
{
$parsed = @parse_url($url);
$hostname = '';
if (x($parsed)) {
$this->scheme = $parsed['scheme'];
if (!empty($parsed['scheme'])) {
$this->scheme = $parsed['scheme'];
}
if (!empty($parsed['host'])) {
$hostname = $parsed['host'];
}
$hostname = $parsed['host'];
if (x($parsed, 'port')) {
$hostname .= ':' . $parsed['port'];
}
@@ -432,7 +438,7 @@ class App
$this->hostname = Config::get('config', 'hostname');
}
if (!isset($this->hostname) || ( $this->hostname == '')) {
if (!isset($this->hostname) || ($this->hostname == '')) {
$this->hostname = $hostname;
}
}