bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove group_member.uid

Browse source 
- Use contact.uid alternatively
- Use JOIN with group table
This commit is contained in:
Hypolite Petovan 2017-12-14 22:47:58 -05:00
commit 179b311978
6 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/acl_selectors.php
View file

@ -529,7 +529,7 @@ function acl_lookup(App $a, $out_type = 'json') {
// This can be done when we can delete cache entries via wildcard
$r = q("SELECT `group`.`id`, `group`.`name`, GROUP_CONCAT(DISTINCT `group_member`.`contact-id` SEPARATOR ',') AS uids
FROM `group`
INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id` AND `group_member`.`uid` = `group`.`uid`
INNER JOIN `group_member` ON `group_member`.`gid`=`group`.`id`
WHERE NOT `group`.`deleted` AND `group`.`uid` = %d
$sql_extra
GROUP BY `group`.`name`, `group`.`id`

2
include/uimport.php
View file

@ -232,8 +232,6 @@ function import_account(App $a, $file) {
}
foreach ($account['group_member'] as &$group_member) {
$group_member['uid'] = $newuid;
$import = 0;
foreach ($account['group'] as $group) {
if ($group['id'] == $group_member['gid'] && isset($group['newid'])) {