diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-26 01:23:17 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-26 01:23:17 -0400 |
| commit | 040d1467f356eb7a5d940b9cd779eb735b401794 (patch) | |
| tree | 4bbcd661b2029bc37bfcd2a6cf324d9a4b3fc7c7 /mod/dfrn_confirm.php | |
| parent | 25547cb21fff3f702a81abbeb5332094c020109e (diff) | |
| parent | f5290a5a107ef2d6c309c4a3205319c9b0d13994 (diff) | |
| download | volse-hubzilla-040d1467f356eb7a5d940b9cd779eb735b401794.tar.gz volse-hubzilla-040d1467f356eb7a5d940b9cd779eb735b401794.tar.bz2 volse-hubzilla-040d1467f356eb7a5d940b9cd779eb735b401794.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
missing entries on personal tab after sql text search optimise
bug #434 - default group placement not working after accepting dfrn friend request
fix wall_uploaded photo permissions on group post by member
improve location change notifications
keep private FB stuff out of personal notes
rev update
DE update to strings and templates
* master:
Diffstat (limited to 'mod/dfrn_confirm.php')
| -rw-r--r-- | mod/dfrn_confirm.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 093993bbc..564ae5ca2 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -500,7 +500,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { ); if($contact && $g && intval($g[0]['def_gid'])) { require_once('include/group.php'); - group_add_member($uid,'',$contact[0]['id'],$g[0]['def_gid']); + group_add_member($uid,'',$contact['id'],$g[0]['def_gid']); } // Let's send our user to the contact editor in case they want to |