aboutsummaryrefslogtreecommitdiffstats
path: root/mod/follow.php
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-05-18 12:12:40 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-05-18 12:12:40 -0400
commit83f0807e59b5be288374a825d1e4f75869d515de (patch)
tree8f3226d74c76d736564e0c6ed9e97f6d0388126c /mod/follow.php
parentc024c17b5f7253432e9c53aa642f003b537f6b6b (diff)
parent38217444502aee41d71d90c0c8927999bb1b12e6 (diff)
downloadvolse-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 'mod/follow.php')
-rw-r--r--mod/follow.php10
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);