diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-18 12:12:40 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-18 12:12:40 -0400 |
| commit | 83f0807e59b5be288374a825d1e4f75869d515de (patch) | |
| tree | 8f3226d74c76d736564e0c6ed9e97f6d0388126c /include/diaspora.php | |
| parent | c024c17b5f7253432e9c53aa642f003b537f6b6b (diff) | |
| parent | 38217444502aee41d71d90c0c8927999bb1b12e6 (diff) | |
| download | volse-hubzilla-83f0807e59b5be288374a825d1e4f75869d515de.tar.gz volse-hubzilla-83f0807e59b5be288374a825d1e4f75869d515de.tar.bz2 volse-hubzilla-83f0807e59b5be288374a825d1e4f75869d515de.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
apply max-width to images in posts, duepuntozero
theming for default group selector
catch more places to apply default group
make it difficult to setup a private forum with no privacy
more private forums, default privacy group for new contacts
tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work
* 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 |