3 files changed, 17 insertions, 4 deletions
diff --git a/mod/groups/actions/groups/edit.php b/mod/groups/actions/groups/edit.php
index b513a6098..a3ad91622 100644
--- a/mod/groups/actions/groups/edit.php
+++ b/mod/groups/actions/groups/edit.php
@@ -15,6 +15,8 @@ function profile_array_decoder(&$v) {
 	$v = html_entity_decode($v, ENT_COMPAT, 'UTF-8');
 }
 
+elgg_make_sticky_form('groups');
+
 // Get group fields
 $input = array();
 foreach ($CONFIG->group as $shortname => $valuetype) {
@@ -106,6 +108,9 @@ if (elgg_get_plugin_setting('hidden_groups', 'groups') == 'yes') {
 
 $group->save();
 
+// group saved so clear sticky form
+elgg_clear_sticky_form('groups');
+
 // group creator needs to be member of new group and river entry created
 if ($new_group_flag) {
 	elgg_set_page_owner_guid($group->guid);
diff --git a/mod/groups/lib/discussion.php b/mod/groups/lib/discussion.php
index 02ab27fdc..ab2fe4849 100644
--- a/mod/groups/lib/discussion.php
+++ b/mod/groups/lib/discussion.php
@@ -15,7 +15,7 @@ function discussion_handle_all_page() {
 		'type' => 'object',
 		'subtype' => 'groupforumtopic',
 		'order_by' => 'e.last_action desc',
-		'limit' => 40,
+		'limit' => 20,
 		'full_view' => false,
 	));
 
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index 8055b6430..7540d1bf9 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -5,8 +5,16 @@
  * @package ElggGroups
  */
 
+if (elgg_is_sticky_form('groups')) {
+	$sticky_values = elgg_get_sticky_values('groups');
+	elgg_clear_sticky_form('groups');
+}
+
 // new groups default to open membership
-if (isset($vars['entity'])) {
+if (isset($sticky_values)) {
+	$membership = $sticky_values['membership'];
+	$access = $sticky_values['access_id'];
+} elseif (isset($vars['entity'])) {
 	$membership = $vars['entity']->membership;
 	$access = $vars['entity']->access_id;
 	if ($access != ACCESS_PUBLIC && $access != ACCESS_LOGGED_IN) {
@@ -27,7 +35,7 @@ if (isset($vars['entity'])) {
 	<label><?php echo elgg_echo("groups:name"); ?></label><br />
 	<?php echo elgg_view("input/text", array(
 		'name' => 'name',
-		'value' => $vars['entity']->name,
+		'value' => isset($sticky_values['name']) ? $sticky_values['name'] : $vars['entity']->name,
 	));
 	?>
 </div>
@@ -45,7 +53,7 @@ if ($group_profile_fields > 0) {
 		echo "</label>$line_break";
 		echo elgg_view("input/{$valtype}", array(
 			'name' => $shortname,
-			'value' => $vars['entity']->$shortname,
+			'value' => isset($sticky_values[$shortname]) ? $sticky_values[$shortname] : $vars['entity']->$shortname,
 		));
 		echo '</div>';
 	}