Merge pull request #552 from annando/master

[friendica.git] / include / user.php

diff --git a/include/user.php b/include/user.php
index 2d06ef3742e092ff051d1596abe33bddea160ff3..282bbdbba24761acc46d6a9bfeb78b25cf725678 100644 (file)
--- a/include/user.php
+++ b/include/user.php
@@ -277,18 +277,24 @@ function create_user($arr) {
                require_once('include/group.php');
                group_add($newuid, t('Friends'));
 
-               if(! get_config('system', 'newuser_public')) {
-                       $r = q("SELECT id FROM `group` WHERE uid = %d AND name = '%s'",
-                               intval($newuid),
-                               dbesc(t('Friends'))
+               $r = q("SELECT id FROM `group` WHERE uid = %d AND name = '%s'",
+                       intval($newuid),
+                       dbesc(t('Friends'))
+               );
+               if($r && count($r)) {
+                       $def_gid = $r[0]['id'];
+
+                       q("UPDATE user SET def_gid = %d WHERE uid = %d",
+                               intval($r[0]['id']),
+                               intval($newuid)
+                       );
+               }
+
+               if(get_config('system', 'newuser_private') && $def_gid) {
+                       q("UPDATE user SET allow_gid = '%s' WHERE uid = %d",
+                          dbesc("<" . $def_gid . ">"),
+                          intval($newuid)
                        );
-                       if($r) {
-                               q("UPDATE user SET def_gid = %d, allow_gid = '%s' WHERE uid = %d",
-                                  intval($r[0]['id']),
-                                  dbesc("<" . $r[0]['id'] . ">"),
-                                  intval($newuid)
-                               );
-                       }
                }
 
        }