aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-05 14:56:58 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-05 14:56:58 +0000
commit0ae667cf5970d93660b32d38e438f83fb73fdff9 (patch)
tree6f32aab87931a26a293f383e51a277ffde7f0e07
parent47b3a072490903349922b565ec3b393a82f1c8a9 (diff)
downloadelgg-0ae667cf5970d93660b32d38e438f83fb73fdff9.tar.gz
elgg-0ae667cf5970d93660b32d38e438f83fb73fdff9.tar.bz2
Further sitename fix.
git-svn-id: https://code.elgg.org/elgg/trunk@805 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--views/default/page_elements/header.php2
-rw-r--r--views/default/pageshell.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php
index c84647098..ebfab43de 100644
--- a/views/default/page_elements/header.php
+++ b/views/default/page_elements/header.php
@@ -42,7 +42,7 @@
<div id="container">
<div id="header">
<!-- display the page title -->
- <h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['sitename']; ?></a></h1>
+ <h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1>
<h2><?php echo $vars['title']; ?></h2>
<!-- display top level navigation -->
<?php echo elgg_view('navigation/topmenu'); ?>
diff --git a/views/default/pageshell.php b/views/default/pageshell.php
index 002f41e9b..33ca0cbd0 100644
--- a/views/default/pageshell.php
+++ b/views/default/pageshell.php
@@ -20,11 +20,11 @@
// Set title
if (empty($vars['title'])) {
- $title = $vars['sitename'];
- } else if (empty($vars['sitename'])) {
+ $title = $vars['config']->sitename;
+ } else if (empty($vars['config']->sitename)) {
$title = $vars['title'];
} else {
- $title = $vars['sitename'] . ": " . $vars['title'];
+ $title = $vars['config']->sitename . ": " . $vars['title'];
}
?>