- batch manager was not calling invalidate_user_cache
- batch manager can delete photos added by ftp - call sync_users on admin page less often (too many sql queries) git-svn-id: http://piwigo.org/svn/trunk@8756 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
7889e86b9b
commit
90911d747f
2 changed files with 15 additions and 7 deletions
13
admin.php
13
admin.php
|
@ -69,8 +69,10 @@ if (isset($_GET['change_theme']))
|
|||
// +-----------------------------------------------------------------------+
|
||||
// | synchronize user informations |
|
||||
// +-----------------------------------------------------------------------+
|
||||
|
||||
sync_users();
|
||||
if (mt_rand(0,9)==0)
|
||||
{
|
||||
sync_users();
|
||||
}
|
||||
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | variables init |
|
||||
|
@ -197,7 +199,6 @@ if (
|
|||
'cat_move', // ?only POST
|
||||
'cat_options', // ?only POST; public/private; lock/unlock
|
||||
'cat_perm', // ?only POST
|
||||
'element_set', // ?only POST; associate/dissociate
|
||||
'picture_modify', // ?only POST; associate/dissociate
|
||||
'user_list', // ?only POST; group assoc
|
||||
'user_perm',
|
||||
|
@ -205,6 +206,12 @@ if (
|
|||
'group_list', // delete group
|
||||
)
|
||||
)
|
||||
or ( isset($_POST) and in_array($page['page'],
|
||||
array(
|
||||
'batch_manager', // associate/dissociate; delete; set level
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
{
|
||||
invalidate_user_cache();
|
||||
|
|
|
@ -412,14 +412,15 @@ if (count($page['cat_elements_id']) > 0)
|
|||
{
|
||||
$query = '
|
||||
SELECT
|
||||
COUNT(*)
|
||||
id
|
||||
FROM '.IMAGES_TABLE.'
|
||||
WHERE id IN ('.implode(',', $page['cat_elements_id']).')
|
||||
AND storage_category_id IS NULL
|
||||
AND file NOT LIKE \'http%\'
|
||||
LIMIT 1
|
||||
;';
|
||||
list($counter) = pwg_db_fetch_row(pwg_query($query));
|
||||
;
|
||||
|
||||
if ($counter > 0)
|
||||
if ( pwg_db_fetch_row(pwg_query($query)) )
|
||||
{
|
||||
$template->assign('show_delete_form', true);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue