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 /include/diaspora.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 'include/diaspora.php')
| -rw-r--r-- | include/diaspora.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 2051de5fc..3f2cdf8e4 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -569,6 +569,14 @@ function diaspora_request($importer,$xml) { return; } + $g = q("select def_gid from user where uid = %d limit 1", + intval($importer['uid']) + ); + if($g && intval($g[0]['def_gid'])) { + require_once('include/group.php'); + group_add_member($importer['uid'],'',$contact_record['id'],$g[0]['def_gid']); + } + if($importer['page-flags'] == PAGE_NORMAL) { $hash = random_string() . (string) time(); // Generate a confirm_key |