aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-12-19 16:48:17 -0800
committerfriendica <info@friendica.com>2012-12-19 16:48:17 -0800
commit893ba371a90a8f304e4e1707d40cbcc3295a43b2 (patch)
tree8f2955975b1610516bc3bb23d690fe0f8a78c50f /boot.php
parent44e70bdca367344c441b1e26e790ac0465953734 (diff)
downloadvolse-hubzilla-893ba371a90a8f304e4e1707d40cbcc3295a43b2.tar.gz
volse-hubzilla-893ba371a90a8f304e4e1707d40cbcc3295a43b2.tar.bz2
volse-hubzilla-893ba371a90a8f304e4e1707d40cbcc3295a43b2.zip
set_baseurl issue, more cleanup
Diffstat (limited to 'boot.php')
-rw-r--r--boot.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/boot.php b/boot.php
index 0736502b0..653a0ed59 100644
--- a/boot.php
+++ b/boot.php
@@ -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);