diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-26 01:23:17 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-26 01:23:17 -0400 |
| commit | 040d1467f356eb7a5d940b9cd779eb735b401794 (patch) | |
| tree | 4bbcd661b2029bc37bfcd2a6cf324d9a4b3fc7c7 /mod/profiles.php | |
| parent | 25547cb21fff3f702a81abbeb5332094c020109e (diff) | |
| parent | f5290a5a107ef2d6c309c4a3205319c9b0d13994 (diff) | |
| download | volse-hubzilla-040d1467f356eb7a5d940b9cd779eb735b401794.tar.gz volse-hubzilla-040d1467f356eb7a5d940b9cd779eb735b401794.tar.bz2 volse-hubzilla-040d1467f356eb7a5d940b9cd779eb735b401794.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
missing entries on personal tab after sql text search optimise
bug #434 - default group placement not working after accepting dfrn friend request
fix wall_uploaded photo permissions on group post by member
improve location change notifications
keep private FB stuff out of personal notes
rev update
DE update to strings and templates
* master:
Diffstat (limited to 'mod/profiles.php')
| -rw-r--r-- | mod/profiles.php | 13 |
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); |