diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-07-25 11:13:06 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-07-25 11:13:06 +0000 |
| commit | ed6238f72c00f27b5df94f478d4ff70ab91982a2 (patch) | |
| tree | 03d8b8e7e925e2549b5117b87a301d3f42b7b5aa | |
| parent | 57f49dfda6a79b58b2721886684cee9ad2479708 (diff) | |
| download | elgg-ed6238f72c00f27b5df94f478d4ff70ab91982a2.tar.gz elgg-ed6238f72c00f27b5df94f478d4ff70ab91982a2.tar.bz2 | |
sitedescription now loaded into config and displayed
git-svn-id: https://code.elgg.org/elgg/trunk@1525 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | actions/admin/site/update_basic.php | 6 | ||||
| -rw-r--r-- | 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;
|