aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-26 07:18:23 +1000
committerredmatrix <redmatrix@redmatrix.me>2015-07-26 07:18:23 +1000
commit7d6612224060b814f7fc4f7726240f3239785e47 (patch)
treea0e10729b0b301ef0d03f497eb6d551d74a90710 /mod
parentcc5b0cde1df8f47ccf6db13304ffca25c7ff5f9a (diff)
parent6e557aa153592a4e30e133403f281a84c472ec91 (diff)
downloadvolse-hubzilla-7d6612224060b814f7fc4f7726240f3239785e47.tar.gz
volse-hubzilla-7d6612224060b814f7fc4f7726240f3239785e47.tar.bz2
volse-hubzilla-7d6612224060b814f7fc4f7726240f3239785e47.zip
Merge pull request #22 from git-marijus/master
fix abook_pending reset to 1 loop if $new_friend is false and remove …
Diffstat (limited to 'mod')
-rw-r--r--mod/connedit.php4
1 files 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),