aboutsummaryrefslogtreecommitdiff
path: root/actions/systemsettings/install.php
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-01-08 20:49:45 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-01-08 20:49:45 +0000
commitbb4f01a334c5e8e50b25e21a9b5d2593f9a0b9e1 (patch)
tree6489893a3bf9a6c0458b1ca6ba231b5bd7821bc2 /actions/systemsettings/install.php
parent627c1feda5e45c4c0c6cbbc944563d9fc868e8c9 (diff)
downloadelgg-bb4f01a334c5e8e50b25e21a9b5d2593f9a0b9e1.tar.gz
elgg-bb4f01a334c5e8e50b25e21a9b5d2593f9a0b9e1.tar.bz2
Fixes #1172: URL now checked for trailing slash upon installation.
git-svn-id: http://code.elgg.org/elgg/trunk@3787 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'actions/systemsettings/install.php')
-rw-r--r--actions/systemsettings/install.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php
index 41a2a8b22..c4f563beb 100644
--- a/actions/systemsettings/install.php
+++ b/actions/systemsettings/install.php
@@ -22,6 +22,7 @@ if (get_input('settings') == 'go') {
// Sanitise
$path = sanitise_filepath(get_input('path'));
$dataroot = sanitise_filepath(get_input('dataroot'));
+ $url = sanitise_filepath(get_input('wwwroot'));
// Blank?
if ($dataroot == "/") {
@@ -40,7 +41,7 @@ if (get_input('settings') == 'go') {
$site = new ElggSite();
$site->name = get_input('sitename');
- $site->url = get_input('wwwroot');
+ $site->url = $url;
$site->description = get_input('sitedescription');
$site->email = get_input('siteemail');
$site->access_id = ACCESS_PUBLIC;