From a823e18207c814ca6020d64a89cb0ea1e365eadb Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Mon, 7 Nov 2011 20:31:07 -0500 Subject: Refs #4007 previous solution to admin population in ElggUser was throwing warnings --- engine/classes/ElggUser.php | 1 - views/default/js/initialize_elgg.php | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/classes/ElggUser.php b/engine/classes/ElggUser.php index 51440687d..75ac008f6 100644 --- a/engine/classes/ElggUser.php +++ b/engine/classes/ElggUser.php @@ -526,7 +526,6 @@ class ElggUser extends ElggEntity 'name', 'username', 'language', - 'admin', )); } diff --git a/views/default/js/initialize_elgg.php b/views/default/js/initialize_elgg.php index 09e0b27bc..f8234f84f 100644 --- a/views/default/js/initialize_elgg.php +++ b/views/default/js/initialize_elgg.php @@ -41,6 +41,7 @@ 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) . ');'; } -- cgit v1.2.3