diff options
| author | zottel <github@zottel.net> | 2012-05-20 09:08:56 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-20 09:08:56 +0200 |
| commit | 2cd3ec7b983327f8c162845d0f4b8d9753f30e27 (patch) | |
| tree | 3eefeaf641e91416fa7b43b9a36b829f28ff1983 /include/diaspora.php | |
| parent | 764ac240a9a9ffb7c855a69bc2f81e9d314a617f (diff) | |
| parent | f16a1199408d167bbc7c52dc408ef02b36808317 (diff) | |
| download | volse-hubzilla-2cd3ec7b983327f8c162845d0f4b8d9753f30e27.tar.gz volse-hubzilla-2cd3ec7b983327f8c162845d0f4b8d9753f30e27.tar.bz2 volse-hubzilla-2cd3ec7b983327f8c162845d0f4b8d9753f30e27.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 |