Closes #120

git-svn-id: https://code.elgg.org/elgg/trunk@1306 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 9 insertions, 2 deletions

diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index abb226464..4fcaa80a3 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -47,7 +47,14 @@
 	<p>
 		<label>
 			<?php echo elgg_echo('groups:membership'); ?><br />
-			<?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => $access_id, 'options' => array( 0 => 'Private', 2=>'Public'))); ?>
+			<?php echo elgg_view('input/access', array('internalname' => 'membership','value' => $vars['entity']->membership, 'options' => array( 0 => 'Private', 2=>'Public'))); ?>
+		</label>
+	</p>
+	
+	<p>
+		<label>
+			<?php echo elgg_echo('groups:access'); ?><br />
+			<?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => $vars['entity']->access_id )); ?>
 		</label>
 	</p>
 
diff --git a/mod/groups/views/default/groups/menu/actions.php b/mod/groups/views/default/groups/menu/actions.php
index 8e1130871..4c27fea9b 100644
--- a/mod/groups/views/default/groups/menu/actions.php
+++ b/mod/groups/views/default/groups/menu/actions.php
@@ -17,7 +17,7 @@
 		}
 		else
 		{
-			if ($vars['entity']->access_id == 2)
+			if ($vars['entity']->isPublicMembership())
 			{
 				?><p><a href="<?php echo $vars['url']; ?>action/groups/join?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("groups:join"); ?></a></p><?php		
 			}