diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-29 12:36:38 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-29 12:36:38 +0000 |
| commit | f0e7d14c218696142b41e0183dc734ddff162018 (patch) | |
| tree | 9d085eaef6bf5425796951cc50c3c50bbb666417 /views | |
| parent | e7fd07af05e1812e08a2e5ea39912e61af17d2d1 (diff) | |
| download | elgg-f0e7d14c218696142b41e0183dc734ddff162018.tar.gz elgg-f0e7d14c218696142b41e0183dc734ddff162018.tar.bz2 | |
Refs #2428 added elgg_get_config(), elgg_set_config(), and elgg_save_config()
git-svn-id: http://code.elgg.org/elgg/trunk@7470 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/page_shells/admin.php | 10 | ||||
| -rw-r--r-- | views/default/page_shells/default.php | 10 | ||||
| -rw-r--r-- | views/default/page_shells/walled_garden.php | 7 |
3 files changed, 14 insertions, 13 deletions
diff --git a/views/default/page_shells/admin.php b/views/default/page_shells/admin.php index cc65b6fda..9fdbf2e28 100644 --- a/views/default/page_shells/admin.php +++ b/views/default/page_shells/admin.php @@ -5,22 +5,22 @@ * @package Elgg
* @subpackage Core
*
- * @uses $vars['config'] The site configuration settings, imported
* @uses $vars['title'] The page title
* @uses $vars['body'] The main content of the page
- * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages()
+ * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages()
*/
// Set the content type
header("Content-type: text/html; charset=UTF-8");
// Set title
+$site_title = elgg_get_config('sitename');
if (empty($vars['title'])) {
- $title = $vars['config']->sitename;
-} else if (empty($vars['config']->sitename)) {
+ $title = $site_title;
+} else if (empty($site_title)) {
$title = $vars['title'];
} else {
- $title = $vars['config']->sitename . ": " . $vars['title'];
+ $title = $site_title . ": " . $vars['title'];
}
echo elgg_view('page_elements/html_begin', $vars);
diff --git a/views/default/page_shells/default.php b/views/default/page_shells/default.php index 30196a139..0fd407a3d 100644 --- a/views/default/page_shells/default.php +++ b/views/default/page_shells/default.php @@ -6,22 +6,22 @@ * @package Elgg * @subpackage Core * - * @uses $vars['config'] The site configuration settings, imported * @uses $vars['title'] The page title * @uses $vars['body'] The main content of the page - * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages() + * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages() */ // Set the content type header("Content-type: text/html; charset=UTF-8"); // Set title +$site_title = elgg_get_config('sitename'); if (empty($vars['title'])) { - $title = $vars['config']->sitename; -} else if (empty($vars['config']->sitename)) { + $title = $site_title; +} else if (empty($site_title)) { $title = $vars['title']; } else { - $title = $vars['config']->sitename . ": " . $vars['title']; + $title = $site_title . ": " . $vars['title']; } echo elgg_view('page_elements/html_begin', $vars); diff --git a/views/default/page_shells/walled_garden.php b/views/default/page_shells/walled_garden.php index 0da1aeb67..cdd3982ec 100644 --- a/views/default/page_shells/walled_garden.php +++ b/views/default/page_shells/walled_garden.php @@ -7,12 +7,13 @@ header("Content-type: text/html; charset=UTF-8"); // Set title +$site_title = elgg_get_config('sitename'); if (empty($vars['title'])) { - $title = $vars['config']->sitename; -} elseif (empty($vars['config']->sitename)) { + $title = $site_title; +} else if (empty($site_title)) { $title = $vars['title']; } else { - $title = $vars['config']->sitename . ": " . $vars['title']; + $title = $site_title . ": " . $vars['title']; } echo elgg_view('page_elements/html_begin', $vars); |