aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-26 16:51:01 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-26 16:51:01 -0700
commit70a5a7b717955138279f2dd8f2a1de16aa76bd53 (patch)
tree3854bf5d77a4fb6a62385b33e81f696acea35364 /mod
parent3880b485cbae2a03284fc1b6f236f0cfa6f5cfc6 (diff)
parent7d6612224060b814f7fc4f7726240f3239785e47 (diff)
downloadvolse-hubzilla-70a5a7b717955138279f2dd8f2a1de16aa76bd53.tar.gz
volse-hubzilla-70a5a7b717955138279f2dd8f2a1de16aa76bd53.tar.bz2
volse-hubzilla-70a5a7b717955138279f2dd8f2a1de16aa76bd53.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla
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 a23e89d4c..866f83615 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),