From a5b2cf82007ac1b2461ba86b79c48e43c2640053 Mon Sep 17 00:00:00 2001 From: mistic100 Date: Mon, 26 May 2014 22:03:57 +0000 Subject: feature 3077 : factorize code for categories cache (TODO for other collections) + fix incorrect categories list for dissociation git-svn-id: http://piwigo.org/svn/trunk@28542 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/batch_manager_global.php | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'admin/batch_manager_global.php') diff --git a/admin/batch_manager_global.php b/admin/batch_manager_global.php index 6e65c462d..26e0e7660 100644 --- a/admin/batch_manager_global.php +++ b/admin/batch_manager_global.php @@ -519,30 +519,8 @@ SELECT } } -$template->assign( 'filter_category_selected', $selected_category); +$template->assign('filter_category_selected', $selected_category); -// Dissociate from a category : categories listed for dissociation can only -// represent virtual links. We can't create orphans. Links to physical -// categories can't be broken. -if (count($page['cat_elements_id']) > 0) -{ - $query = ' -SELECT - DISTINCT(category_id) AS id, - c.name, - c.uppercats, - c.global_rank - FROM '.IMAGE_CATEGORY_TABLE.' AS ic - JOIN '.CATEGORIES_TABLE.' AS c ON c.id = ic.category_id - JOIN '.IMAGES_TABLE.' AS i ON i.id = ic.image_id - WHERE ic.image_id IN ('.implode(',', $page['cat_elements_id']).') - AND ( - ic.category_id != i.storage_category_id - OR i.storage_category_id IS NULL - ) -;'; - display_select_cat_wrapper($query, array(), 'dissociate_options', true); -} if (count($page['cat_elements_id']) > 0) { -- cgit v1.2.3