diff options
| author | Cash Costello <cash.costello@gmail.com> | 2013-04-16 15:43:34 -0700 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2013-04-16 15:43:34 -0700 |
| commit | 9dc21d3970b9f6e56438ae2f8875b1c8bec40e03 (patch) | |
| tree | a40aeeb9ce673983c68e2c76f2299d3d3f4fe8c4 /actions | |
| parent | a5f085929cc9556d179932c3927d7dbf6562b5bb (diff) | |
| parent | 6c7ec418fc0a5b35489614325c807d6f523844df (diff) | |
| download | elgg-9dc21d3970b9f6e56438ae2f8875b1c8bec40e03.tar.gz elgg-9dc21d3970b9f6e56438ae2f8875b1c8bec40e03.tar.bz2 | |
Merge pull request #5366 from mrclay/5363
Fixes #5363: Append trailing slash to site URL if missing
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/admin/site/update_advanced.php | 6 |
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) { |