aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engine/lib/configuration.php3
-rw-r--r--views/default/pageshell.php6
2 files changed, 6 insertions, 3 deletions
diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
index 697bd247d..66b36bf63 100644
--- a/engine/lib/configuration.php
+++ b/engine/lib/configuration.php
@@ -39,6 +39,9 @@
$CONFIG->wwwroot .= str_replace($_SERVER['DOCUMENT_ROOT'],"",$CONFIG->path);
}
+ if (empty($CONFIG->sitename))
+ $CONFIG->sitename = "New Elgg site";
+
}
?> \ No newline at end of file
diff --git a/views/default/pageshell.php b/views/default/pageshell.php
index 499f1486e..f242335f8 100644
--- a/views/default/pageshell.php
+++ b/views/default/pageshell.php
@@ -19,11 +19,11 @@
// Set title
if (empty($vars['title'])) {
- $title = $vars['config']->sitename;
- } else if (empty($vars['config']->sitename)) {
+ $title = $vars['sitename'];
+ } else if (empty($vars['sitename'])) {
$title = $vars['title'];
} else {
- $title = $vars['config']->sitename . ": " . $vars['title'];
+ $title = $vars['sitename'] . ": " . $vars['title'];
}
?>