X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fgroup.php;h=2f8053eefb8ed5bb717b528841aa91f3930c9a3b;hb=44592611e1582fd97ae1988343418a0dae1ae2a0;hp=e9f9561f4613eaa0728b06f5e1113828e1cb7c15;hpb=be40fb8186bc18e3562d780a7153f76ee7d5e90f;p=friendica.git

diff --git a/mod/group.php b/mod/group.php
index e9f9561f46..2f8053eefb 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -1,18 +1,21 @@
 <?php
 
+if(! function_exists('validate_members')) {
 function validate_members(&$item) {
 	$item = intval($item);
 }
+}
 
+if(! function_exists('group_init')) {
 function group_init(&$a) {
 	if(local_user()) {
 		require_once('include/group.php');
 		$a->page['aside'] = group_side('contacts','group','extended',(($a->argc > 1) ? intval($a->argv[1]) : 0));
 	}
 }
+}
 
-
-
+if(! function_exists('group_post')) {
 function group_post(&$a) {
 
 	if(! local_user()) {
@@ -64,7 +67,9 @@ function group_post(&$a) {
 	}
 	return;
 }
+}
 
+if(! function_exists('group_content')) {
 function group_content(&$a) {
 	$change = false;
 
@@ -190,6 +195,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,7 +210,7 @@ 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())
 	);
 
@@ -228,5 +234,5 @@ function group_content(&$a) {
 	}
 
 	return replace_macros($tpl, $context);
-
+}
 }