From 3dba152c4914a6650879deb8044ebb7234e51bea Mon Sep 17 00:00:00 2001
From: Paweł Sroka <srokap@gmail.com>
Date: Fri, 7 Jun 2013 03:13:23 +0200
Subject: Refs #5587 - Uses sticky values in profile edit form

---
 views/default/forms/profile/edit.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'views/default/forms/profile/edit.php')

diff --git a/views/default/forms/profile/edit.php b/views/default/forms/profile/edit.php
index 9538b779e..aef180f36 100644
--- a/views/default/forms/profile/edit.php
+++ b/views/default/forms/profile/edit.php
@@ -13,6 +13,8 @@
 </div>
 <?php
 
+$stickyValues = 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) {
@@ -40,6 +42,14 @@ if (is_array($profile_fields) && count($profile_fields) > 0) {
 			$access_id = ACCESS_DEFAULT;
 		}
 
+		//sticky form values take precedence over saved ones
+		if (isset($stickyValues[$shortname])) {
+			$value = $stickyValues[$shortname];
+		}
+		if (isset($stickyValues['accesslevel'][$shortname])) {
+			$access_id = $stickyValues['accesslevel'][$shortname];
+		}
+
 ?>
 <div>
 	<label><?php echo elgg_echo("profile:{$shortname}") ?></label>
-- 
cgit v1.2.3


From 666b214e94b80b713797710d04d06d3f11271ff0 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Fri, 7 Jun 2013 18:26:18 -0400
Subject: clearing sticky form after it is used on edit form

---
 actions/profile/edit.php             |  2 +-
 views/default/forms/profile/edit.php | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'views/default/forms/profile/edit.php')

diff --git a/actions/profile/edit.php b/actions/profile/edit.php
index c2a124309..e1f066e82 100644
--- a/actions/profile/edit.php
+++ b/actions/profile/edit.php
@@ -82,7 +82,7 @@ if (sizeof($input) > 0) {
 		);
 		elgg_delete_metadata($options);
 		
-		if(!is_null($value) && ($value !== '')){
+		if (!is_null($value) && ($value !== '')) {
 			// only create metadata for non empty values (0 is allowed) to prevent metadata records with empty string values #4858
 			
 			if (isset($accesslevel[$shortname])) {
diff --git a/views/default/forms/profile/edit.php b/views/default/forms/profile/edit.php
index aef180f36..cb0a37ca4 100644
--- a/views/default/forms/profile/edit.php
+++ b/views/default/forms/profile/edit.php
@@ -13,7 +13,7 @@
 </div>
 <?php
 
-$stickyValues = elgg_get_sticky_values('profile:edit');
+$sticky_values = elgg_get_sticky_values('profile:edit');
 
 $profile_fields = elgg_get_config('profile_fields');
 if (is_array($profile_fields) && count($profile_fields) > 0) {
@@ -42,12 +42,12 @@ if (is_array($profile_fields) && count($profile_fields) > 0) {
 			$access_id = ACCESS_DEFAULT;
 		}
 
-		//sticky form values take precedence over saved ones
-		if (isset($stickyValues[$shortname])) {
-			$value = $stickyValues[$shortname];
+		// sticky form values take precedence over saved ones
+		if (isset($sticky_values[$shortname])) {
+			$value = $sticky_values[$shortname];
 		}
-		if (isset($stickyValues['accesslevel'][$shortname])) {
-			$access_id = $stickyValues['accesslevel'][$shortname];
+		if (isset($sticky_values['accesslevel'][$shortname])) {
+			$access_id = $sticky_values['accesslevel'][$shortname];
 		}
 
 ?>
@@ -69,6 +69,9 @@ if (is_array($profile_fields) && count($profile_fields) > 0) {
 <?php
 	}
 }
+
+elgg_clear_sticky_form('profile:edit');
+
 ?>
 <div class="elgg-foot">
 <?php
-- 
cgit v1.2.3