1 files changed, 28 insertions, 11 deletions

diff --git a/views/default/forms/profile/edit.php b/views/default/forms/profile/edit.php
index 108e7f9f2..cb0a37ca4 100644
--- a/views/default/forms/profile/edit.php
+++ b/views/default/forms/profile/edit.php
@@ -7,16 +7,22 @@
 
 ?>
 
-<p>
+<div>
 	<label><?php echo elgg_echo('user:name:label'); ?></label>
-	<?php echo elgg_view('input/text',array('internalname' => 'name', 'value' => $vars['entity']->name)); ?>
-</p>
+	<?php echo elgg_view('input/text', array('name' => 'name', 'value' => $vars['entity']->name)); ?>
+</div>
 <?php
 
+$sticky_values = elgg_get_sticky_values('profile:edit');
+
 $profile_fields = elgg_get_config('profile_fields');
 if (is_array($profile_fields) && count($profile_fields) > 0) {
 	foreach ($profile_fields as $shortname => $valtype) {
-		$metadata = get_metadata_byname($vars['entity']->guid, $shortname);
+		$metadata = elgg_get_metadata(array(
+			'guid' => $vars['entity']->guid,
+			'metadata_name' => $shortname,
+			'limit' => false
+		));
 		if ($metadata) {
 			if (is_array($metadata)) {
 				$value = '';
@@ -36,29 +42,40 @@ if (is_array($profile_fields) && count($profile_fields) > 0) {
 			$access_id = ACCESS_DEFAULT;
 		}
 
+		// sticky form values take precedence over saved ones
+		if (isset($sticky_values[$shortname])) {
+			$value = $sticky_values[$shortname];
+		}
+		if (isset($sticky_values['accesslevel'][$shortname])) {
+			$access_id = $sticky_values['accesslevel'][$shortname];
+		}
+
 ?>
-<p>
+<div>
 	<label><?php echo elgg_echo("profile:{$shortname}") ?></label>
 	<?php
 		$params = array(
-			'internalname' => $shortname,
+			'name' => $shortname,
 			'value' => $value,
 		);
 		echo elgg_view("input/{$valtype}", $params);
 		$params = array(
-			'internalname' => "accesslevel[$shortname]",
+			'name' => "accesslevel[$shortname]",
 			'value' => $access_id,
 		);
 		echo elgg_view('input/access', $params);
 	?>
-</p>
+</div>
 <?php
 	}
 }
+
+elgg_clear_sticky_form('profile:edit');
+
 ?>
-<p>
+<div class="elgg-foot">
 <?php
-	echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $vars['entity']->guid));
+	echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid));
 	echo elgg_view('input/submit', array('value' => elgg_echo('save')));
 ?>
-</p>
+</div>