X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fgroup.php;h=5b28784f5663cc1b7056125b26619416e9e76b6d;hb=b628e82465b5bcb6e325c3982e4c87c7bb4f845e;hp=263586e2e903458f1cf7627a8849ffc4bdc64149;hpb=76adcdc031ffa9657fe8352c108697680bdcf44b;p=friendica.git diff --git a/mod/group.php b/mod/group.php index 263586e2e9..5b28784f56 100644 --- a/mod/group.php +++ b/mod/group.php @@ -7,7 +7,7 @@ function validate_members(&$item) { function group_init(&$a) { if(local_user()) { require_once('include/group.php'); - $a->page['aside'] = group_side('contacts','group',false,(($a->argc > 1) ? intval($a->argv[1]) : 0)); + $a->page['aside'] = group_side('contacts','group','extended',(($a->argc > 1) ? intval($a->argv[1]) : 0)); } } @@ -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,7 +205,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()) );