aboutsummaryrefslogtreecommitdiffstats
path: root/mod/setup.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-12 20:36:32 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-12 20:36:32 -0700
commitf88dc84091844a4a36dca4da6ce6f1e8bc57c470 (patch)
tree978e93ab8985d8255682e4116aceb42b9d35e8a5 /mod/setup.php
parentb634c08d0e4a79b650439429254288789f47ba50 (diff)
parent3099562a2112cd83cf2a273eb4876a8f922a072c (diff)
downloadvolse-hubzilla-f88dc84091844a4a36dca4da6ce6f1e8bc57c470.tar.gz
volse-hubzilla-f88dc84091844a4a36dca4da6ce6f1e8bc57c470.tar.bz2
volse-hubzilla-f88dc84091844a4a36dca4da6ce6f1e8bc57c470.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: view/es/htconfig.tpl view/es/update_fail_eml.tpl
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);