diff options
| author | zottel <github@zottel.net> | 2011-12-06 00:02:29 -0800 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2011-12-06 00:02:29 -0800 |
| commit | cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa (patch) | |
| tree | 2efc84f14303c5d8dd283a93b64f02851e969e3f /mod/follow.php | |
| parent | c5c99089ff363831f199e27c188410fec682fda5 (diff) | |
| parent | 47f369e052d296f4a744c1508efc58f6168b7e8b (diff) | |
| download | volse-hubzilla-cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa.tar.gz volse-hubzilla-cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa.tar.bz2 volse-hubzilla-cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/follow.php')
| -rw-r--r-- | mod/follow.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mod/follow.php b/mod/follow.php index 0329d1eee..2d643400a 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -67,6 +67,8 @@ function follow_post(&$a) { } $writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0); + $hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0); + if($ret['network'] === NETWORK_MAIL) { $writeable = 1; @@ -101,8 +103,8 @@ function follow_post(&$a) { // create contact record $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`, - `writable`, `blocked`, `readonly`, `pending` ) - VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ", + `writable`, `hidden`, `blocked`, `readonly`, `pending` ) + VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0 ) ", intval(local_user()), dbesc(datetime_convert()), dbesc($ret['url']), @@ -120,7 +122,8 @@ function follow_post(&$a) { dbesc($ret['pubkey']), intval($new_relation), intval($ret['priority']), - intval($writeable) + intval($writeable), + intval($hidden) ); } |