harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

set_baseurl issue, more cleanup

Browse Source
This commit is contained in:
friendica
2012-12-19 16:48:17 -08:00
parent 44e70bdca3
commit 893ba371a9
6 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@@ -638,7 +638,7 @@ if(! class_exists('App')) {
$scheme = 'http';
}
}
$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
return $this->baseurl;
}
@@ -647,7 +647,7 @@ if(! class_exists('App')) {
if(is_array($this->config) && array_key_exists('system',$this->config) &&
array_key_exists('baseurl',$this->config['system']) && strlen($this->config['system']['baseurl'])) {
$url = $a->config['system']['baseurl'];
$url = $this->config['system']['baseurl'];
}
$parsed = @parse_url($url);