1 files changed, 16 insertions, 9 deletions

diff --git a/views/default/js/initialize_elgg.php b/views/default/js/initialize_elgg.php
index 03d5adc5a..b45c33463 100644
--- a/views/default/js/initialize_elgg.php
+++ b/views/default/js/initialize_elgg.php
@@ -1,20 +1,24 @@
 <?php 
 /**
- * 
+ * Initialize Elgg's js lib with the uncacheable data
  */
 
+if (0) { ?><script><?php }
 ?>
-<script type="text/javascript">
 /**
  * Don't want to cache these -- they could change for every request
  */
-elgg.config.lastcache = <?php echo (int)($vars['config']->lastcache); ?>;
+elgg.config.lastcache = <?php echo (int)elgg_get_config('lastcache'); ?>;
+elgg.config.viewtype = '<?php echo elgg_get_viewtype(); ?>';
+elgg.config.simplecache_enabled = <?php echo (int)elgg_is_simplecache_enabled(); ?>;
 
 elgg.security.token.__elgg_ts = <?php echo $ts = time(); ?>;
 elgg.security.token.__elgg_token = '<?php echo generate_action_token($ts); ?>';
 
 <?php
-$page_owner = elgg_get_page_owner();
+// @todo json export should be smoother than this...  
+// @todo Might also be nice to make url exportable. $entity->url? yes please!
+$page_owner = elgg_get_page_owner_entity();
 
 if ($page_owner instanceof ElggEntity) {
 	$page_owner_json = array();
@@ -25,10 +29,10 @@ if ($page_owner instanceof ElggEntity) {
 	$page_owner_json['subtype'] = $page_owner->getSubtype();
 	$page_owner_json['url'] = $page_owner->getURL();
 	
-	echo 'elgg.page_owner =  '.json_encode($page_owner_json).';'; 
+	echo 'elgg.page_owner =  ' . json_encode($page_owner_json) . ';'; 
 }
 
-$user = get_loggedin_user();
+$user = elgg_get_logged_in_user_entity();
 
 if ($user instanceof ElggUser) {
 	$user_json = array();
@@ -38,8 +42,11 @@ if ($user instanceof ElggUser) {
 	
 	$user_json['subtype'] = $user->getSubtype();
 	$user_json['url'] = $user->getURL();
+	$user_json['admin'] = $user->isAdmin();
 	
-	echo 'elgg.session.user = new elgg.ElggUser('.json_encode($user_json).');'; 
+	echo 'elgg.session.user = new elgg.ElggUser(' . json_encode($user_json) . ');'; 
 }
-?>;
-</script>
\ No newline at end of file
+?>
+
+//Before the DOM is ready, but elgg's js framework is fully initalized
+elgg.trigger_hook('boot', 'system');
\ No newline at end of file