diff options
| author | mrjive <mrjive@mrjive.it> | 2015-10-26 21:55:47 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2015-10-26 21:55:47 +0100 |
| commit | a4c3058f845a1c38d06b2201a10700c5f878366d (patch) | |
| tree | bab86468397e523457ba25199cb9a67265980e00 /mod/connedit.php | |
| parent | 32522b61f235266384c81c0669fceaf58afeb4fe (diff) | |
| parent | 6cb7afcbc0447b60de0128f9a912e10ae125ba45 (diff) | |
| download | volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.tar.gz volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.tar.bz2 volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.zip | |
Merge pull request #7 from redmatrix/master
updating from original codebase
Diffstat (limited to 'mod/connedit.php')
| -rw-r--r-- | mod/connedit.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mod/connedit.php b/mod/connedit.php index 75a5fd719..65eba885a 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) { |