diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-30 12:05:49 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-01-30 12:05:49 +0100 |
| commit | 76484f154124ccade9efd3a6b704692112a97477 (patch) | |
| tree | 51919a98826ee650dd9f04d111527a494810d29b /boot.php | |
| parent | 9abff11f86b70b22d5a95105b8c54755f536ac0d (diff) | |
| parent | b6543beca2f0e5e353b497099e3fa6b29bf47233 (diff) | |
| download | volse-hubzilla-76484f154124ccade9efd3a6b704692112a97477.tar.gz volse-hubzilla-76484f154124ccade9efd3a6b704692112a97477.tar.bz2 volse-hubzilla-76484f154124ccade9efd3a6b704692112a97477.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'boot.php')
| -rwxr-xr-x | boot.php | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -863,7 +863,7 @@ class App { && array_key_exists('baseurl',$this->config['system']) && strlen($this->config['system']['baseurl'])) { $url = $this->config['system']['baseurl']; - + $url = trim($url,'\\/'); return $url; } @@ -881,6 +881,7 @@ class App { && array_key_exists('baseurl',$this->config['system']) && strlen($this->config['system']['baseurl'])) { $url = $this->config['system']['baseurl']; + $url = trim($url,'\\/'); } $parsed = @parse_url($url); |