diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-05-19 14:04:24 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-05-19 14:04:24 +0200 |
| commit | 9a940786c18c1c2bd772aec93f1828f67dc45667 (patch) | |
| tree | 54114a005e74c8a6d8bad8a490e1d1e41bc4178f /mod/follow.php | |
| parent | f2c0c40f6e488f1a8e62bda9449b28115f343cac (diff) | |
| parent | 513ef2410d9b892c8ebcb7ceac96b97023c3b5a5 (diff) | |
| download | volse-hubzilla-9a940786c18c1c2bd772aec93f1828f67dc45667.tar.gz volse-hubzilla-9a940786c18c1c2bd772aec93f1828f67dc45667.tar.bz2 volse-hubzilla-9a940786c18c1c2bd772aec93f1828f67dc45667.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/follow.php')
| -rw-r--r-- | mod/follow.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/mod/follow.php b/mod/follow.php index 4a7f99bf0..cdecd5f2a 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -109,6 +109,7 @@ function follow_init(&$a) { dbesc($ret['poll']) ); + if(count($r)) { // update contact if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) { @@ -165,6 +166,15 @@ function follow_init(&$a) { $contact = $r[0]; $contact_id = $r[0]['id']; + + $g = q("select def_gid from user where uid = %d limit 1", + intval($uid) + ); + if($g && intval($g[0]['def_gid'])) { + require_once('include/group.php'); + group_add_member($uid,'',$contact_id,$g[0]['def_gid']); + } + require_once("Photo.php"); $photos = import_profile_photo($ret['photo'],$uid,$contact_id); |