diff options
| author | zottel <github@zottel.net> | 2012-05-30 11:08:02 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-30 11:08:02 +0200 |
| commit | 24b58af68938558baa2ddc6809401ec528ff1176 (patch) | |
| tree | 4347cab04767aafe7b5567d68539e666284fa3cc /mod/profiles.php | |
| parent | 36d6018c110fca190b720c5ff27883c2d4ed70c3 (diff) | |
| parent | 88a0d6a1d53a93fa0d43591f85b72a8a72c13d53 (diff) | |
| download | volse-hubzilla-24b58af68938558baa2ddc6809401ec528ff1176.tar.gz volse-hubzilla-24b58af68938558baa2ddc6809401ec528ff1176.tar.bz2 volse-hubzilla-24b58af68938558baa2ddc6809401ec528ff1176.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/profiles.php')
| -rw-r--r-- | mod/profiles.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mod/profiles.php b/mod/profiles.php index 8e4fba74e..ca3890eb9 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -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); |