Fixes #2682 strips tags from site name

diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php
index 97d258b65fb0c9970f39253b2a50e9c55e250f65..9765182cc8b202be5ea5977fabbeb34c26c70f2a 100644 (file)
--- a/actions/admin/site/update_basic.php
+++ b/actions/admin/site/update_basic.php
@@ -16,7 +16,7 @@ if ($site = elgg_get_site_entity()) {
        }
 
        $site->description = get_input('sitedescription');
-       $site->name = get_input('sitename');
+       $site->name = strip_tags(get_input('sitename'));
        $site->email = get_input('siteemail');
        $site->save();
 

diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index 93716f7cd957f32add4ee273aefdb2d7a88a63b1..78cdde90fb35f787e471db9c155a59fa91d14495 100644 (file)
--- a/install/ElggInstaller.php
+++ b/install/ElggInstaller.php
@@ -1414,7 +1414,7 @@ class ElggInstaller {
                $submissionVars['wwwroot'] = sanitise_filepath($submissionVars['wwwroot']);
 
                $site = new ElggSite();
-               $site->name = $submissionVars['sitename'];
+               $site->name = strip_tags($submissionVars['sitename']);
                $site->url = $submissionVars['wwwroot'];
                $site->access_id = ACCESS_PUBLIC;
                $site->email = $submissionVars['siteemail'];