aboutsummaryrefslogtreecommitdiffstats
path: root/mod/notifications.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2012-04-13 11:59:25 +0200
committerFabio Comuni <fabrix.xm@gmail.com>2012-04-13 11:59:25 +0200
commitf6e1ddf7fbcc122f5122336650e1cfaa71aed8e3 (patch)
treefeddc7956054f7966e2f4ebd4231df20e9e31fee /mod/notifications.php
parent469710893da118d9fd174d69cc47069541bafe7b (diff)
parentdf1904b204a969780609cac64bbb1a03a8dd3fcb (diff)
downloadvolse-hubzilla-f6e1ddf7fbcc122f5122336650e1cfaa71aed8e3.tar.gz
volse-hubzilla-f6e1ddf7fbcc122f5122336650e1cfaa71aed8e3.tar.bz2
volse-hubzilla-f6e1ddf7fbcc122f5122336650e1cfaa71aed8e3.zip
Merge remote-tracking branch 'friendica/master'
Diffstat (limited to 'mod/notifications.php')
-rw-r--r--mod/notifications.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/notifications.php b/mod/notifications.php
index 690a99562..8e3eebba1 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -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'), get_config('system','post_newfriend'), t('if applicable')),
'$url' => zrl($rr['url']),
'$knowyou' => $knowyou,
'$approve' => t('Approve'),