diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-11-07 20:31:07 -0500 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2011-11-16 19:53:02 -0500 |
| commit | a823e18207c814ca6020d64a89cb0ea1e365eadb (patch) | |
| tree | ccf30863c6690e0bf2bd199a8d7818ba1ff5cda2 | |
| parent | b361e2a7152943c938fca21906873206bbb90206 (diff) | |
| download | elgg-a823e18207c814ca6020d64a89cb0ea1e365eadb.tar.gz elgg-a823e18207c814ca6020d64a89cb0ea1e365eadb.tar.bz2 | |
Refs #4007 previous solution to admin population in ElggUser was throwing warnings
| -rw-r--r-- | engine/classes/ElggUser.php | 1 | ||||
| -rw-r--r-- | views/default/js/initialize_elgg.php | 1 |
2 files changed, 1 insertions, 1 deletions
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) . ');'; } |