iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #1182 with inheritance_by_default, copy only permissions from parents and do not add admins

Browse Source
This commit is contained in:
plegall
2020-05-07 12:30:47 +02:00
parent 40182f7774
commit b31d68fbd9
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin/include/functions.php
View File

@@ -1571,7 +1571,7 @@ SELECT id, uppercats, global_rank, visible, status
WHERE cat_id = '.$insert['id_uppercat'].'
;';
$granted_users = query2array($query, null, 'user_id');
add_permission_on_category($inserted_id, array_unique(array_merge(get_admins(), array($user['id']), $granted_users)));
add_permission_on_category($inserted_id, $granted_users);
}
elseif ('private' == $insert['status'])
{

9
admin/site_update.php
View File

@@ -314,7 +314,7 @@ SELECT id_uppercat, MAX(`rank`)+1 AS next_rank
pwg_activity('album', $category_ids, 'add', array('sync'=>true));
$category_up=implode(',',array_unique($category_up));
if ($conf['inheritance_by_default'])
if ($conf['inheritance_by_default'] and !empty($category_up))
{
$query = '
SELECT *
@@ -395,13 +395,6 @@ SELECT id_uppercat, MAX(`rank`)+1 AS next_rank
);
}
}
foreach (get_admins() as $granted_user)
{
$insert_granted_users[] = array(
'user_id' => $granted_user,
'cat_id' => $ids
);
}
}
}
mass_inserts(GROUP_ACCESS_TABLE, array('group_id','cat_id'), $insert_granted_grps);