- dont't invalidate_user_cache on batch manager refresh photo set or add/remove caddie or generate/delete derivatives

- removed double sql query from batch_manager_global

git-svn-id: http://piwigo.org/svn/trunk@28490 68402e56-0260-453c-a942-63ccdbb3a9ee

3 files changed, 12 insertions, 6 deletions

diff --git a/admin.php b/admin.php
index cf36ce516..478b0edde 100644
--- a/admin.php
+++ b/admin.php
@@ -270,7 +270,6 @@ if (
           'album',        // public/private; lock/unlock, permissions
           'cat_move',
           'cat_options',  // public/private; lock/unlock
-          'batch_manager',  // associate/dissociate; delete; set level
           'user_list',    // group assoc; user level
           'user_perm',
         )
diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php
index ddcfa222c..3268ea278 100644
--- a/admin/batch_manager_global.php
+++ b/admin/batch_manager_global.php
@@ -87,6 +87,11 @@ if (isset($_POST['submit']))
 
   $action = $_POST['selectAction'];
 
+  if (!in_array($action, array('remove_from_caddie','add_to_caddie','delete_derivatives','generate_derivatives')))
+  {
+    invalidate_user_cache();
+  }
+
   if ('remove_from_caddie' == $action)
   {
     $query = '
@@ -376,7 +381,7 @@ DELETE
     $page['infos'][] = l10n('Metadata synchronized from file');
   }
 
-  if ('delete_derivatives' == $action)
+  if ('delete_derivatives' == $action && !empty($_POST['del_derivatives_type']))
   {
     $query='SELECT path,representative_ext FROM '.IMAGES_TABLE.'
   WHERE id IN ('.implode(',', $collection).')';
@@ -493,7 +498,8 @@ $categories = array_from_query($query);
 usort($categories, 'global_rank_compare');
 display_select_categories($categories, array(), 'category_full_name_options', true);
 
-display_select_cat_wrapper($query, array(), 'category_parent_options');
+$template->assign('category_parent_options', $template->get_template_vars('category_full_name_options'));
+$template->assign('category_parent_options_selected', array());
 
 // in the filter box, which category to select by default
 $selected_category = array();
diff --git a/admin/batch_manager_unit.php b/admin/batch_manager_unit.php
index ddf420674..0531c866c 100644
--- a/admin/batch_manager_unit.php
+++ b/admin/batch_manager_unit.php
@@ -116,6 +116,7 @@ SELECT id, date_creation
     );
 
   $page['infos'][] = l10n('Photo informations updated');
+  invalidate_user_cache();
 }
 
 // +-----------------------------------------------------------------------+
@@ -134,7 +135,7 @@ ksort($month_list);
 $template->assign(
   array(
     'U_ELEMENTS_PAGE' => $base_url.get_query_string_diff(array('display','start')),
-    'F_ACTION'=>$base_url.get_query_string_diff(array()),    
+    'F_ACTION'=>$base_url.get_query_string_diff(array()),
     'month_list' => $month_list,
     'level_options' => get_privacy_level_options(),
     )
@@ -192,11 +193,11 @@ if (count($page['cat_elements_id']) > 0)
   $query = '
 SELECT *
   FROM '.IMAGES_TABLE;
-  
+
   if ($is_category)
   {
     $category_info = get_cat_info($_SESSION['bulk_manager_filter']['category']);
-    
+
     $conf['order_by'] = $conf['order_by_inside_category'];
     if (!empty($category_info['image_order']))
     {