X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fgroup.php;h=793e854be046bc7f43db7572b249621e2dc19e8d;hb=4a14e51e25c58d5a81b68798f2340c6196dec8ea;hp=bca369cd1aaaab9c4aa116256e4362009499f283;hpb=52a2c7eb46ea3b9509e48f29eca6f1c398a85538;p=friendica.git

diff --git a/include/group.php b/include/group.php
index bca369cd1a..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,24 +122,30 @@ 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');
+
 $o .= <<< EOT
 
 <div id="group-sidebar">
 <h3>Groups</h3>
 
 <div id="sidebar-new-group">
-<a href="group/new">Create a new group</a>
+<a href="group/new">$createtext</a>
 </div>
 
 <div id="sidebar-group-list">
 	<ul id="sidebar-group-ul">
-	<li class="sidebar-group-li" ><a href="$every">Everybody</a></li>
+	<li class="sidebar-group-li" ><a href="$every" >$linktext</a></li>
 
 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)) {