aboutsummaryrefslogtreecommitdiffstats
path: root/mod/setup.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-08-19 19:40:18 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-08-19 19:40:18 +0200
commite50e68719155c7d35e30bb203a403854f789d5a1 (patch)
treea10630cec177c6629fb0da38d96deb7258062698 /mod/setup.php
parent07cd0c870f48ec838c23fa7c6966ceb1c41f06ab (diff)
parent4e3d295c909405da61d7ccd6c7bd99bd35c9feec (diff)
downloadvolse-hubzilla-e50e68719155c7d35e30bb203a403854f789d5a1.tar.gz
volse-hubzilla-e50e68719155c7d35e30bb203a403854f789d5a1.tar.bz2
volse-hubzilla-e50e68719155c7d35e30bb203a403854f789d5a1.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/setup.php')
-rwxr-xr-xmod/setup.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/mod/setup.php b/mod/setup.php
index bba29921e..15820f14e 100755
--- a/mod/setup.php
+++ b/mod/setup.php
@@ -68,6 +68,10 @@ function setup_post(&$a) {
$adminmail = trim($_POST['adminmail']);
$siteurl = trim($_POST['siteurl']);
+ // $siteurl should not have a trailing slash
+
+ $siteurl = rtrim($siteurl,'/');
+
require_once('include/dba/dba_driver.php');
unset($db);
$db = dba_factory($dbhost, $dbport, $dbuser, $dbpass, $dbdata, $dbtype, true);