diff options
author | Sem <sembrestels@riseup.net> | 2013-08-22 23:38:47 -0400 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2013-08-22 23:38:47 -0400 |
commit | f24e08416c793428ba863840e7d5e502e6d68cfc (patch) | |
tree | d7797c71630ec90fbea310f588a432ac0d39b597 /views/default/page/default.php | |
parent | 88733a24caee170acda071281eb4630bf5ef5794 (diff) | |
parent | 46c365abd6e190a5c389b0dd49b02cd6e878ccd9 (diff) | |
download | elgg-f24e08416c793428ba863840e7d5e502e6d68cfc.tar.gz elgg-f24e08416c793428ba863840e7d5e502e6d68cfc.tar.bz2 |
Merge branch '1.8' of gitorious.org:lorea/html5 into 1.8
Conflicts:
views/default/page/elements/foot.php
views/default/page/elements/owner_block.php
Diffstat (limited to 'views/default/page/default.php')
-rw-r--r-- | views/default/page/default.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/views/default/page/default.php b/views/default/page/default.php index 7a74a0459..4ff2215da 100644 --- a/views/default/page/default.php +++ b/views/default/page/default.php @@ -32,9 +32,14 @@ $header = elgg_view('page/elements/header', $vars); $body = elgg_view('page/elements/body', $vars); $footer = elgg_view('page/elements/footer', $vars); +// Set the content type +header("Content-type: text/html; charset=UTF-8"); + +$lang = get_current_language(); + ?> <!DOCTYPE html> -<html lang="<?php echo get_current_language(); ?>"> +<html lang="<?php echo $lang; ?>"> <head> <?php echo elgg_view('page/elements/head', $vars); ?> </head> @@ -43,14 +48,14 @@ $footer = elgg_view('page/elements/footer', $vars); <div class="elgg-page-messages"> <?php echo $messages; ?> </div> - - <?php if (elgg_is_logged_in()): ?> + + <?php if (elgg_is_logged_in()){ ?> <header class="elgg-page-topbar"> <div class="elgg-inner"> <?php echo $topbar; ?> </div> </header> - <?php endif; ?> + <?php } ?> <header class="elgg-page-header"> <div class="elgg-inner"> |