1 files changed, 26 insertions, 55 deletions
diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php
index 8645d9f9b..9765182cc 100644
--- a/actions/admin/site/update_basic.php
+++ b/actions/admin/site/update_basic.php
@@ -1,56 +1,27 @@
-<?php
-
-	/**
-	 * Elgg update site action
-	 * 
-	 * This is an update version of the sitesettings/install action which is used by the admin panel to modify basic settings.
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Marcus Povey
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.org/
-	 */
+<?php
+/**
+ * Updates the basic settings for the primary site object.
+ *
+ * Basic site settings are saved as metadata on the site object,
+ * with the exception of the default language, which is saved in
+ * the config table.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.Site
+ */
 
-	global $CONFIG;
-	
-	// block non-admin users
-	admin_gatekeeper();
-	
-	if (get_input('settings') == 'go') {
-		
-		if (datalist_get('default_site')) {
-			
-			$site = get_entity(datalist_get('default_site'));
-			if (!($site instanceof ElggSite)) 
-				throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite'));
-			
-			$site->name = get_input('sitename');
-			$site->url = get_input('wwwroot');
-			
-			datalist_set('path',get_input('path'));
-			datalist_set('dataroot',get_input('dataroot'));
-			
-			set_config('language', get_input('language'), $site->getGUID());
-			
-			set_config('view', get_input('view'), $site->getGUID());
-			
-			$debug = get_input('debug');
-			if ($debug)
-				set_config('debug', 1, $site->getGUID());
-			else
-				unset_config('debug', $site->getGUID());
-				
-			
-			$site->save();
-			system_message(elgg_echo("admin:configuration:success"));
-			
-			header("Location: {$CONFIG->wwwroot}admin/site/");
-			exit;
-			
-		}
-		
-	}
-
-?>
-\ No newline at end of file
+if ($site = elgg_get_site_entity()) {
+	if (!($site instanceof ElggSite)) {
+		throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite'));
+	}
+
+	$site->description = get_input('sitedescription');
+	$site->name = strip_tags(get_input('sitename'));
+	$site->email = get_input('siteemail');
+	$site->save();
+
+	set_config('language', get_input('language'), $site->getGUID());
+}
+
+system_message(elgg_echo('admin:configuration:success'));
+forward(REFERER);
+\ No newline at end of file