Merge branch 'dev' into air

1 files changed, 18 insertions, 19 deletions

diff --git a/include/channel.php b/include/channel.php
index 1eb3be96d..3dd8f884e 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -303,8 +303,8 @@ function create_identity($arr) {
 	$photo_type = null;
 
 	$z = [
-			'account' => $a[0],
-			'channel' => $r[0],
+			'account' => $a[0] ?? [],
+			'channel' => $r[0] ?? [],
 			'photo_url' => ''
 	];
 	/**
@@ -503,23 +503,22 @@ function create_identity($arr) {
 		// right away as a default group for new contacts.
 
 		require_once('include/group.php');
-		group_add($newuid, t('Friends'));
-		group_add_member($newuid,t('Friends'),$ret['channel']['channel_hash']);
+		$group_hash = group_add($newuid, t('Friends'));
 
-		// if our role_permissions indicate that we're using a default collection ACL, add it.
+		if($group_hash) {
+			group_add_member($newuid,t('Friends'),$ret['channel']['channel_hash']);
 
-		if(is_array($role_permissions) && $role_permissions['default_collection']) {
-			$r = q("select hash from pgrp where uid = %d and gname = '%s' limit 1",
-				intval($newuid),
-				dbesc( t('Friends') )
-			);
-			if($r) {
-				q("update channel set channel_default_group = '%s', channel_allow_gid = '%s' where channel_id = %d",
-					dbesc($r[0]['hash']),
-					dbesc('<' . $r[0]['hash'] . '>'),
-					intval($newuid)
-				);
+			$default_collection_str = '';
+			// if our role_permissions indicate that we're using a default collection ACL, add it.
+			if(is_array($role_permissions) && $role_permissions['default_collection']) {
+				$default_collection_str = '<' . $group_hash . '>';
 			}
+
+			q("update channel set channel_default_group = '%s', channel_allow_gid = '%s' where channel_id = %d",
+				dbesc($group_hash),
+				dbesc($default_collection_str),
+				intval($newuid)
+			);
 		}
 
 		if(! $system) {
@@ -1098,11 +1097,11 @@ function identity_basic_export($channel_id, $sections = null, $zap_compat = fals
 
 		// @fixme - Not totally certain how to handle $zot_compat for the event timezone which exists
 		// in Hubzilla but is stored with the item and not the event. In Zap, stored information is
-		// always UTC and localised on access as per standard conventions for working with global time data. 
+		// always UTC and localised on access as per standard conventions for working with global time data.
 
 		// Older Zot (pre-Zot6) records aren't translated correctly w/r/t AS2 so only include events for the last year or so if
-		// migrating to Zap. 
-		
+		// migrating to Zap.
+
 		$sqle = (($zap_compat) ? " and created > '2020-01-01 00:00:00' " : '');
 
 		$r = q("select * from event where uid = %d $sqle",