diff options
author | Sem <sembrestels@riseup.net> | 2012-08-04 01:50:01 +0200 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2012-08-04 01:50:01 +0200 |
commit | 18df06b9cd34c62dd8e9b1dfffd2f75e2815d859 (patch) | |
tree | e880bce8a7b10a6b3bc8c60168bc5ab35acf40f8 /mod/groups/views/default/forms | |
parent | 71edfd80a0baf95b86a29547252b01973511828f (diff) | |
parent | 4dd2ca9d54b64ebbf5eba3e3036f747cadb40825 (diff) | |
download | elgg-18df06b9cd34c62dd8e9b1dfffd2f75e2815d859.tar.gz elgg-18df06b9cd34c62dd8e9b1dfffd2f75e2815d859.tar.bz2 |
Merge branch 'translations-fallback-js' of git://github.com/sembrestels/Elgg into lorea-preprod
Conflicts:
mod/developers/views/default/theme_preview/grid.php
Diffstat (limited to 'mod/groups/views/default/forms')
-rw-r--r-- | mod/groups/views/default/forms/groups/edit.php | 14 |
1 files changed, 11 insertions, 3 deletions
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>'; } |