aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-18 20:13:12 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-18 20:13:12 -0700
commitf0a33c00bc7f60f986edc53f3fa98d8b270f978a (patch)
tree5a9d68f3786143ccc632385edf9cad81b8448165 /mod
parent9b3662e5adc58172c6923c1879b226bc208e9ec4 (diff)
downloadvolse-hubzilla-f0a33c00bc7f60f986edc53f3fa98d8b270f978a.tar.gz
volse-hubzilla-f0a33c00bc7f60f986edc53f3fa98d8b270f978a.tar.bz2
volse-hubzilla-f0a33c00bc7f60f986edc53f3fa98d8b270f978a.zip
separate permission_update notification into permission_create and permission_update, since some networks send out a notification for duplicate share requests even if connected.
Diffstat (limited to 'mod')
-rw-r--r--mod/connedit.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/mod/connedit.php b/mod/connedit.php
index 75a5fd719..6170d05a8 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -190,7 +190,7 @@ function connedit_post(&$a) {
}
}
- $abook_pending = $new_friend ? 0 : $orig_record[0]['abook_pending'];
+ $abook_pending = (($new_friend) ? 0 : $orig_record[0]['abook_pending'];
$r = q("UPDATE abook SET abook_profile = '%s', abook_my_perms = %d , abook_closeness = %d, abook_pending = %d,
abook_incl = '%s', abook_excl = '%s'
@@ -214,7 +214,6 @@ function connedit_post(&$a) {
}
-
if($r)
info( t('Connection updated.') . EOL);
else
@@ -222,7 +221,7 @@ function connedit_post(&$a) {
if($a->poi && $a->poi['abook_my_perms'] != $abook_my_perms
&& (! intval($a->poi['abook_self']))) {
- proc_run('php', 'include/notifier.php', 'permission_update', $contact_id);
+ proc_run('php', 'include/notifier.php', (($new_friend) ? 'permission_create' : 'permission_update'), $contact_id);
}
if($new_friend) {