X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fgroup.php;h=793e854be046bc7f43db7572b249621e2dc19e8d;hb=468c1824054b7527a3d691e0e404e09c37721711;hp=848db43bd3485c5add4bd70c6cd7eee64d1801bf;hpb=2e5fb9c37e76c20ea0c25e1215a549b561dc68a8;p=friendica.git

diff --git a/include/group.php b/include/group.php
index 848db43bd3..793e854be0 100644
--- a/include/group.php
+++ b/include/group.php
@@ -38,7 +38,7 @@ function group_rmv($uid,$name) {
 		);
 
 		// remove group
-		$r = q("DELETE FROM `group` WHERE `uid` = %d AND `id` = %d LIMIT 1",
+		$r = q("UPDATE `group` SET `deleted` = 1 WHERE `uid` = %d AND `name` = '%s' LIMIT 1",
 			intval($uid),
 			dbesc($name)
 		);
@@ -46,7 +46,6 @@ function group_rmv($uid,$name) {
 		$ret = $r;
 
 	}
-	// TODO!! remove this group from all content ACL's !!
 
 	return $ret;
 }
@@ -123,11 +122,13 @@ function group_get_members($gid) {
 
 function group_side($every="contacts",$each="group") {
 
+	$o = '';
+
 	if(! local_user())
-		return;
+		return '';
 
-$createtext = t('Create a new group');
-$linktext= t('Everybody');
+	$createtext = t('Create a new group');
+	$linktext= t('Everybody');
 
 $o .= <<< EOT
 
@@ -144,7 +145,7 @@ $o .= <<< EOT
 
 EOT;
 
-	$r = q("SELECT * FROM `group` WHERE `uid` = %d",
+	$r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d",
 		intval($_SESSION['uid'])
 	);
 	if(count($r)) {