From: Steve Clay <steve@mrclay.org>
Date: Tue, 16 Apr 2013 01:03:00 +0000 (-0400)
Subject: Fixes #5363: Append trailing slash to site URL if missing
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=6c7ec418fc0a5b35489614325c807d6f523844df;p=lorea%2Felgg.git

Fixes #5363: Append trailing slash to site URL if missing
---

diff --git a/actions/admin/site/update_advanced.php b/actions/admin/site/update_advanced.php
index 0fd8d1f35..4888b0a8d 100644
--- a/actions/admin/site/update_advanced.php
+++ b/actions/admin/site/update_advanced.php
@@ -14,10 +14,10 @@ if ($site = elgg_get_site_entity()) {
 		throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite'));
 	}
 
-	$site->url = get_input('wwwroot');
+	$site->url = rtrim(get_input('wwwroot', '', false), '/') . '/';
 
-	datalist_set('path', sanitise_filepath(get_input('path')));
-	$dataroot = sanitise_filepath(get_input('dataroot'));
+	datalist_set('path', sanitise_filepath(get_input('path', '', false)));
+	$dataroot = sanitise_filepath(get_input('dataroot', '', false));
 
 	// check for relative paths
 	if (stripos(PHP_OS, 'win') === 0) {