diff options
| author | Michael <icarus@dabo.de> | 2012-04-14 13:03:40 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-04-14 13:03:40 +0200 |
| commit | 188829ed46be6d3c7a91380226e26e8292c327be (patch) | |
| tree | 2fb4148bc2222cf198309f4025862080c89fe36b /mod/notifications.php | |
| parent | 7384786d4417ddd051b7daa71c019d3c551efc68 (diff) | |
| parent | 0d869ceb65badbd4d80dd0d5cf2d631bca7f5b9e (diff) | |
| download | volse-hubzilla-188829ed46be6d3c7a91380226e26e8292c327be.tar.gz volse-hubzilla-188829ed46be6d3c7a91380226e26e8292c327be.tar.bz2 volse-hubzilla-188829ed46be6d3c7a91380226e26e8292c327be.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/notifications.php')
| -rw-r--r-- | mod/notifications.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/notifications.php b/mod/notifications.php index 690a99562..b28b1478d 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -151,7 +151,7 @@ function notifications_content(&$a) { '$fullname' => $rr['fname'], '$url' => zrl($rr['furl']), '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), - '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')), + '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), '$knowyou' => $knowyou, '$approve' => t('Approve'), @@ -198,7 +198,7 @@ function notifications_content(&$a) { '$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"), '$fullname' => $rr['name'], '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), - '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')), + '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), '$url' => zrl($rr['url']), '$knowyou' => $knowyou, '$approve' => t('Approve'), |