diff options
| author | Sem <sembrestels@riseup.net> | 2012-10-19 09:47:11 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-10-19 09:47:11 +0200 |
| commit | 80ca3d447737a679f773cbea7e788ee190abea69 (patch) | |
| tree | 62bd6ec58b5fc8ad02bd529d187591659dc39b65 /views | |
| parent | 9a4ed2014e9880130c1bbc52bb980e44a488bad9 (diff) | |
| parent | d134beadb79fcc90a75bda8bbcbfb9987b27470c (diff) | |
| download | elgg-80ca3d447737a679f773cbea7e788ee190abea69.tar.gz elgg-80ca3d447737a679f773cbea7e788ee190abea69.tar.bz2 | |
Merge branch '1.8' of git://github.com/Elgg/Elgg into lorea-preprod
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/core/settings/statistics/numentities.php | 2 | ||||
| -rw-r--r-- | views/default/core/settings/statistics/online.php | 2 | ||||
| -rw-r--r-- | views/default/page/default.php | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/views/default/core/settings/statistics/numentities.php b/views/default/core/settings/statistics/numentities.php index ce1705a2e..3782fd8bc 100644 --- a/views/default/core/settings/statistics/numentities.php +++ b/views/default/core/settings/statistics/numentities.php @@ -7,7 +7,7 @@ */ // Get entity statistics -$entity_stats = get_entity_statistics(elgg_get_logged_in_user_guid()); +$entity_stats = get_entity_statistics(elgg_get_page_owner_guid()); if ($entity_stats) { $rows = ''; diff --git a/views/default/core/settings/statistics/online.php b/views/default/core/settings/statistics/online.php index ce7ff35fb..f50ad9acc 100644 --- a/views/default/core/settings/statistics/online.php +++ b/views/default/core/settings/statistics/online.php @@ -6,7 +6,7 @@ * @subpackage Core */ -$user = elgg_get_logged_in_user_entity(); +$user = elgg_get_page_owner_entity(); $logged_in = 0; $log = get_system_log($user->guid, "login", "", 'user', '', 1); diff --git a/views/default/page/default.php b/views/default/page/default.php index 3724bffd8..567494d0c 100644 --- a/views/default/page/default.php +++ b/views/default/page/default.php @@ -33,9 +33,11 @@ $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 PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang; ?>" lang="<?php echo $lang; ?>"> <head> <?php echo elgg_view('page/elements/head', $vars); ?> </head> @@ -45,13 +47,13 @@ header("Content-type: text/html; charset=UTF-8"); <?php echo $messages; ?> </div> - <?php if (elgg_is_logged_in()): ?> + <?php if (elgg_is_logged_in()){ ?> <div class="elgg-page-topbar"> <div class="elgg-inner"> <?php echo $topbar; ?> </div> </div> - <?php endif; ?> + <?php } ?> <div class="elgg-page-header"> <div class="elgg-inner"> |