aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-21 22:37:45 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-21 22:37:45 +0000
commitb81f168b0bfc298c6eb1c0a2a857311f076c40bd (patch)
tree51d2a92ed92a97fa5a6b37e969b4d415a60889f9 /mod
parent64aafb5ca73d329663a93f80ac9cf3e68a082866 (diff)
downloadelgg-b81f168b0bfc298c6eb1c0a2a857311f076c40bd.tar.gz
elgg-b81f168b0bfc298c6eb1c0a2a857311f076c40bd.tar.bz2
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
Diffstat (limited to 'mod')
-rw-r--r--mod/groups/views/default/forms/groups/edit.php18
1 files changed, 11 insertions, 7 deletions
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)
<?php
$this_owner = $vars['entity']->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));
?>