Merge remote branch 'friendica/master'

1 files changed, 11 insertions, 2 deletions

diff --git a/mod/profiles.php b/mod/profiles.php
index 26fc88765..ca3890eb9 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -146,7 +146,7 @@ function profiles_post(&$a) {
 				$value = $marital;
 			}
 			if($withchanged) {
-				$changes[] = '♥ ' . t('Romantic Partner');
+				$changes[] = '[color=#ff0000]♥[/color] ' . t('Romantic Partner');
 				$value = strip_tags($with);
 			}							
 			if($work != $orig[0]['work']) {
@@ -176,9 +176,18 @@ function profiles_post(&$a) {
 				$changes[] = t('Interests');
 				$value = $interest;
 			}
-			if($address != $orig[0]['address'] || $locality != $orig[0]['locality'] || $region != $orig[0]['region']
+			if($address != $orig[0]['address']) {
+				$changes[] = t('Address');
+				// New address not sent in notifications, potential privacy issues
+				// in case this leaks to unintended recipients. Yes, it's in the public
+				// profile but that doesn't mean we have to broadcast it to everybody.
+			}
+			if($locality != $orig[0]['locality'] || $region != $orig[0]['region']
 				|| $country_name != $orig[0]['country-name']) {
  				$changes[] = t('Location');
+				$comma1 = ((($locality) && ($region || $country_name)) ? ', ' : ' ');
+				$comma2 = (($region && $country_name) ? ', ' : '');
+				$value = $locality . $comma1 . $region . $comma2 . $country_name;
 			}
 
 			profile_activity($changes,$value);