From b81f168b0bfc298c6eb1c0a2a857311f076c40bd Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 21 Aug 2010 22:37:45 +0000 Subject: Merged [6573],[6574],[6582] from 1.7 branch into trunk git-svn-id: http://code.elgg.org/elgg/trunk@6841 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/groups/views/default/forms/groups/edit.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'mod/groups/views/default/forms') diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php index c02b279c1..0c82f5471 100644 --- a/mod/groups/views/default/forms/groups/edit.php +++ b/mod/groups/views/default/forms/groups/edit.php @@ -78,17 +78,21 @@ if (is_array($vars['config']->group) && sizeof($vars['config']->group) > 0) owner_guid; - if (!$this_owner) $this_owner = get_loggedin_userid(); + if (!$this_owner) { + $this_owner = get_loggedin_userid(); + } - $access = array(ACCESS_FRIENDS => elgg_echo("access:friends:label"), 1 => elgg_echo("LOGGED_IN"), 2 => elgg_echo("PUBLIC")); - $collections = get_user_access_collections($this_owner); - if (is_array($collections)) - { + $access = array(ACCESS_FRIENDS => elgg_echo("access:friends:label"), ACCESS_LOGGED_IN => elgg_echo("LOGGED_IN"), ACCESS_PUBLIC => elgg_echo("PUBLIC")); + $collections = get_user_access_collections($vars['entity']->guid); + if (is_array($collections)) { foreach ($collections as $c) $access[$c->id] = $c->name; } - - echo elgg_view('input/access', array('internalname' => 'vis', 'value' => ($vars['entity']->access_id ? $vars['entity']->access_id : ACCESS_PUBLIC), 'options' => $access)); + + $current_access = ($vars['entity']->access_id ? $vars['entity']->access_id : ACCESS_PUBLIC); + echo elgg_view('input/access', array('internalname' => 'vis', + 'value' => $current_access, + 'options' => $access)); ?> -- cgit v1.2.3