aboutsummaryrefslogtreecommitdiff
path: root/actions/admin/site
diff options
context:
space:
mode:
authorSteve Clay <steve@mrclay.org>2013-04-15 21:03:00 -0400
committerSteve Clay <steve@mrclay.org>2013-04-15 21:03:00 -0400
commit6c7ec418fc0a5b35489614325c807d6f523844df (patch)
tree4e823d5e5446a10c5c3b4c2c42fb24274933e2e2 /actions/admin/site
parent6470154396269707e95c6dbbf40157f533928059 (diff)
downloadelgg-6c7ec418fc0a5b35489614325c807d6f523844df.tar.gz
elgg-6c7ec418fc0a5b35489614325c807d6f523844df.tar.bz2
Fixes #5363: Append trailing slash to site URL if missing
Diffstat (limited to 'actions/admin/site')
-rw-r--r--actions/admin/site/update_advanced.php6
1 files changed, 3 insertions, 3 deletions
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) {