From 627060b324f43ebe63af4a705a70673096f33607 Mon Sep 17 00:00:00 2001
From: marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 25 Jul 2008 10:30:20 +0000
Subject: Now possible to specify a site description.

git-svn-id: https://code.elgg.org/elgg/trunk@1523 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 actions/admin/site/update_basic.php | 3 ++-
 actions/systemsettings/install.php  | 3 ++-
 languages/en.php                    | 3 ++-
 views/default/settings/system.php   | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php
index 8645d9f9b..d45e54e76 100644
--- a/actions/admin/site/update_basic.php
+++ b/actions/admin/site/update_basic.php
@@ -25,7 +25,8 @@
 			$site = get_entity(datalist_get('default_site'));
 			if (!($site instanceof ElggSite)) 
 				throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite'));
-			
+			
+			$site->description = get_input('sitedescription');
 			$site->name = get_input('sitename');
 			$site->url = get_input('wwwroot');
 			
diff --git a/actions/systemsettings/install.php b/actions/systemsettings/install.php
index db7b89a88..f6832843e 100644
--- a/actions/systemsettings/install.php
+++ b/actions/systemsettings/install.php
@@ -19,7 +19,8 @@
 			
 			$site = new ElggSite();
 			$site->name = get_input('sitename');
-			$site->url = get_input('wwwroot');
+			$site->url = get_input('wwwroot');
+			$site->description = get_input('sitedescription');
 			$site->access_id = 2; // The site is public
 			$guid = $site->save();
 			
diff --git a/languages/en.php b/languages/en.php
index e7fe65c51..dfecfb4bf 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -477,7 +477,8 @@ Alternatively, you can enter your database settings below and we will try and do
 	
 			'installation:settings:dbwizard:savefail' => "We were unable to save the new settings.php. Please save the following file as engine/settings.php using a text editor.",
 	
-			'sitename' => "The name of your site (eg \"My social networking site\"):",
+			'sitename' => "The name of your site (eg \"My social networking site\"):",
+			'sitedescription' => "Short description of your site (optional)",
 			'wwwroot' => "The site URL, followed by a trailing slash:",
 			'path' => "The full path to your site root on your disk, followed by a trailing slash:",
 			'dataroot' => "The full path to the directory where uploaded files will be stored, followed by a trailing slash:",
diff --git a/views/default/settings/system.php b/views/default/settings/system.php
index ad509724a..f29f0606b 100644
--- a/views/default/settings/system.php
+++ b/views/default/settings/system.php
@@ -27,7 +27,7 @@
 		
 <?php
 
-		foreach(array('sitename','wwwroot','path','dataroot', 'view') as $field) {
+		foreach(array('sitename','sitedescription', 'wwwroot','path','dataroot', 'view') as $field) {
 
 ?>
 		<p>
-- 
cgit v1.2.3