From 6e557aa153592a4e30e133403f281a84c472ec91 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 25 Jul 2015 17:41:19 +0200 Subject: fix abook_pending reset to 1 loop if $new_friend is false and remove unused var --- mod/connedit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/connedit.php b/mod/connedit.php index 2340ce678..91dfc21e2 100644 --- a/mod/connedit.php +++ b/mod/connedit.php @@ -130,7 +130,6 @@ function connedit_post(&$a) { } } - $abook_flags = $orig_record[0]['abook_flags']; $new_friend = false; if(! $is_self) { @@ -191,6 +190,7 @@ function connedit_post(&$a) { } } + $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' @@ -198,7 +198,7 @@ function connedit_post(&$a) { dbesc($profile_id), intval($abook_my_perms), intval($closeness), - intval(1 - intval($new_friend)), + intval($abook_pending), dbesc($abook_incl), dbesc($abook_excl), intval($contact_id), -- cgit v1.2.3