aboutsummaryrefslogtreecommitdiffstats
path: root/mod/dfrn_request.php
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-05-01 08:21:12 +0200
committerzottel <github@zottel.net>2012-05-01 08:21:12 +0200
commit2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177 (patch)
tree2ca4af49655a3cf4f1a2d2cf4ea7b5936b8d9a17 /mod/dfrn_request.php
parent43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720 (diff)
parentf175af05f92384fab7adb75390a8aa52dc1bd7e1 (diff)
downloadvolse-hubzilla-2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177.tar.gz
volse-hubzilla-2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177.tar.bz2
volse-hubzilla-2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/dfrn_request.php')
-rw-r--r--mod/dfrn_request.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 18798aa15..2169c494c 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -700,7 +700,8 @@ function dfrn_request_content(&$a) {
'node' => $r[0]['nickname'],
'dfrn_id' => $r[0]['issued-id'],
'intro_id' => $intro[0]['id'],
- 'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0)
+ 'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0),
+ 'activity' => intval(get_pconfig($r[0]['uid'],'system','post_newfriend'))
);
dfrn_confirm_post($a,$handsfree);
}