X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fgroup.php;h=db92ed7de6fb19f1102d6ad4594e6c7c8581d7ba;hb=378cbd90270516be1701adc5bfe64008ef0c17d9;hp=e9f9561f4613eaa0728b06f5e1113828e1cb7c15;hpb=a3059d02d40684f2bc1a0439c979ca7f79d8f10f;p=friendica.git

diff --git a/mod/group.php b/mod/group.php
index e9f9561f46..db92ed7de6 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -43,7 +43,7 @@ function group_post(&$a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if(! count($r)) {
+		if(! dbm::is_result($r)) {
 			notice( t('Group not found.') . EOL );
 			goaway($a->get_baseurl() . '/contacts');
 			return; // NOTREACHED
@@ -107,7 +107,7 @@ function group_content(&$a) {
 				intval($a->argv[2]),
 				intval(local_user())
 			);
-			if(count($r))
+			if (dbm::is_result($r))
 				$result = group_rmv(local_user(),$r[0]['name']);
 			if($result)
 				info( t('Group removed.') . EOL);
@@ -125,7 +125,7 @@ function group_content(&$a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if(count($r))
+		if (dbm::is_result($r))
 			$change = intval($a->argv[2]);
 	}
 
@@ -136,7 +136,7 @@ function group_content(&$a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if(! count($r)) {
+		if(! dbm::is_result($r)) {
 			notice( t('Group not found.') . EOL );
 			goaway($a->get_baseurl() . '/contacts');
 		}
@@ -190,6 +190,7 @@ function group_content(&$a) {
 		'label_members' => t('Members'),
 		'members' => array(),
 		'label_contacts' => t('All Contacts'),
+		'group_is_empty' => t('Group is empty'),
 		'contacts' => array(),
 	);
 
@@ -204,11 +205,11 @@ function group_content(&$a) {
 			group_rmv_member(local_user(),$group['name'],$member['id']);
 	}
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0 ORDER BY `name` ASC",
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `self` ORDER BY `name` ASC",
 		intval(local_user())
 	);
 
-	if(count($r)) {
+	if (dbm::is_result($r)) {
 		$textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
 		foreach($r as $member) {
 			if(! in_array($member['id'],$preselected)) {