From ed7210a35f3367bf6325ec805fcc7cad01f94c4c Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Tue, 19 Feb 2013 22:06:25 -0500
Subject: Auto-prepend "http://" to URL profile fields without it

---
 actions/profile/edit.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'actions/profile/edit.php')

diff --git a/actions/profile/edit.php b/actions/profile/edit.php
index 89bf2bc0b..63fb31600 100644
--- a/actions/profile/edit.php
+++ b/actions/profile/edit.php
@@ -48,6 +48,10 @@ foreach ($profile_fields as $shortname => $valuetype) {
 		forward(REFERER);
 	}
 
+	if ($valuetype == 'url' && !preg_match('~^https?\://~i', $value)) {
+		$value = "http://$value";
+	}
+
 	if ($valuetype == 'tags') {
 		$value = string_to_tag_array($value);
 	}
-- 
cgit v1.2.3


From 4da579033674ecdb134bc921f3f0666072419e6c Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Wed, 20 Mar 2013 21:00:41 -0400
Subject: Fixes #5232 handling empty profile url field

---
 actions/profile/edit.php                      |  2 +-
 mod/profile/views/default/profile/details.php | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'actions/profile/edit.php')

diff --git a/actions/profile/edit.php b/actions/profile/edit.php
index 63fb31600..b817463ac 100644
--- a/actions/profile/edit.php
+++ b/actions/profile/edit.php
@@ -48,7 +48,7 @@ foreach ($profile_fields as $shortname => $valuetype) {
 		forward(REFERER);
 	}
 
-	if ($valuetype == 'url' && !preg_match('~^https?\://~i', $value)) {
+	if ($value && $valuetype == 'url' && !preg_match('~^https?\://~i', $value)) {
 		$value = "http://$value";
 	}
 
diff --git a/mod/profile/views/default/profile/details.php b/mod/profile/views/default/profile/details.php
index 167f995ae..15df6c2fd 100644
--- a/mod/profile/views/default/profile/details.php
+++ b/mod/profile/views/default/profile/details.php
@@ -22,13 +22,13 @@ if (is_array($profile_fields) && sizeof($profile_fields) > 0) {
 		}
 		$value = $user->$shortname;
 
-		// validate urls
-		if ($valtype == 'url' && !preg_match('~^https?\://~i', $value)) {
-			$value = "http://$value";
-		}
-
 		if (!empty($value)) {
-			//This function controls the alternating class
+			// validate urls
+			if ($valtype == 'url' && !preg_match('~^https?\://~i', $value)) {
+				$value = "http://$value";
+			}
+
+			// this controls the alternating class
 			$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
 			?>
 			<div class="<?php echo $even_odd; ?>">
-- 
cgit v1.2.3


From 50ca9866486b27defa3b327f0b501ee316a5efeb Mon Sep 17 00:00:00 2001
From: Paweł Sroka <srokap@gmail.com>
Date: Fri, 7 Jun 2013 02:37:06 +0200
Subject: Fixes #5587 - Makes profile edit form sticky

---
 actions/profile/edit.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'actions/profile/edit.php')

diff --git a/actions/profile/edit.php b/actions/profile/edit.php
index b817463ac..c2a124309 100644
--- a/actions/profile/edit.php
+++ b/actions/profile/edit.php
@@ -4,6 +4,8 @@
  *
  */
 
+elgg_make_sticky_form('profile:edit');
+
 $guid = get_input('guid');
 $owner = get_entity($guid);
 
@@ -107,6 +109,7 @@ if (sizeof($input) > 0) {
 	// Notify of profile update
 	elgg_trigger_event('profileupdate', $owner->type, $owner);
 
+	elgg_clear_sticky_form('profile:edit');
 	system_message(elgg_echo("profile:saved"));
 }
 
-- 
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 'actions/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