From ed6238f72c00f27b5df94f478d4ff70ab91982a2 Mon Sep 17 00:00:00 2001 From: marcus Date: Fri, 25 Jul 2008 11:13:06 +0000 Subject: sitedescription now loaded into config and displayed git-svn-id: https://code.elgg.org/elgg/trunk@1525 36083f99-b078-4883-b0ff-0f9b5a30f544 --- actions/admin/site/update_basic.php | 6 ++++-- engine/lib/configuration.php | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php index d45e54e76..d86ec9981 100644 --- a/actions/admin/site/update_basic.php +++ b/actions/admin/site/update_basic.php @@ -44,8 +44,10 @@ unset_config('debug', $site->getGUID()); - $site->save(); - system_message(elgg_echo("admin:configuration:success")); + if ($site->save()) + system_message(elgg_echo("admin:configuration:success")); + else + register_error(elgg_echo("admin:configuration:fail")); header("Location: {$CONFIG->wwwroot}admin/site/"); exit; diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php index 7383b6a35..bdba96b2b 100644 --- a/engine/lib/configuration.php +++ b/engine/lib/configuration.php @@ -179,7 +179,8 @@ $CONFIG->dataroot = $dataroot; if (isset($CONFIG->site) && (get_class($CONFIG->site) == "ElggSite")) { $CONFIG->wwwroot = $CONFIG->site->url; - $CONFIG->sitename = $CONFIG->site->name; + $CONFIG->sitename = $CONFIG->site->name; + $CONFIG->sitedescription = $CONFIG->site->description; } $CONFIG->url = $CONFIG->wwwroot; -- cgit v1.2.3