Merge branch 'master' into saravea

Conflicts:
	mod/blog/views/default/blog/sidebar/archives.php

2 files changed, 22 insertions, 20 deletions

diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index 93716f7cd..78cdde90f 100644
--- 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'];
diff --git a/install/cli/sample_installer.php b/install/cli/sample_installer.php
index 0bae0cd23..a51f9aae4 100644
--- a/install/cli/sample_installer.php
+++ b/install/cli/sample_installer.php
@@ -1,28 +1,12 @@
 <?php
+
 /**
  * Sample cli installer script
  */
 
+// change to true to run this script. Change back to false when done.
 $enabled = false;
 
-// Do not edit below this line. //////////////////////////////
-
-
-if (!$enabled) {
-	echo "To enable this script, change \$enabled to true.\n";
-	echo "You *must* disable this script after a successful installation.\n";
-	exit;
-}
-
-if (PHP_SAPI !== 'cli') {
-	echo "You must use the command line to run this script.";
-	exit;
-}
-
-require_once(dirname(dirname(__FILE__)) . "/ElggInstaller.php");
-
-$installer = new ElggInstaller();
-
 // none of the following may be empty
 $params = array(
 	// database parameters
@@ -43,11 +27,29 @@ $params = array(
 	'password' => '',
 );
 
+
+// Do not edit below this line. //////////////////////////////
+
+
+if (!$enabled) {
+	echo "To enable this script, change \$enabled to true.\n";
+	echo "You *must* disable this script after a successful installation.\n";
+	exit;
+}
+
+if (PHP_SAPI !== 'cli') {
+	echo "You must use the command line to run this script.";
+	exit;
+}
+
+require_once(dirname(dirname(__FILE__)) . "/ElggInstaller.php");
+
+$installer = new ElggInstaller();
+
 // install and create the .htaccess file
 $installer->batchInstall($params, TRUE);
 
 // at this point installation has completed (otherwise an exception halted execution).
-
 // try to rewrite the script to disable it.
 if (is_writable(__FILE__)) {
 	$code = file_get_contents(__FILE__);