Changeset 4731

Timestamp:

Jan 23, 2010, 11:57:01 PM (14 years ago)

Author:

plg

Message:

merge r4730 from branch 2.0 to trunk

bug 1396: when a photo was deleted, the code to avoid orphans as category
representative was 1) wrong (because a photo doesn't have to belong to a
category to represent it) 2) at the wrong place.

Location:

trunk/admin

Files:

• element_set_global.php (modified) (1 diff)
• include/functions.php (modified) (1 diff)

trunk/admin/element_set_global.php

@@ -86 +86 @@
       if (count($deletables) > 0)
       {
-        // what will be the categories to update? (to avoid orphan on
-        // representative_picture_id)
-        $query = '
-SELECT
-    category_id
-  FROM '.IMAGE_CATEGORY_TABLE.'
-  WHERE image_id IN ('.implode(',', $deletables).')
-;';
-        $categories_to_update = array_from_query($query, 'category_id');
-          
         $physical_deletion = true;
         delete_elements($deletables, $physical_deletion);
-
-        update_category($categories_to_update);
 
         array_push(

trunk/admin/include/functions.php

@@ -263 +263 @@
   pwg_query($query);
 
+  // are the photo used as category representant?
+  $query = '
+SELECT
+    id
+  FROM '.CATEGORIES_TABLE.'
+  WHERE representative_picture_id IN (
+'.wordwrap(implode(', ', $ids), 80, "\n").')
+;';
+  $category_ids = array_from_query($query, 'id');
+  if (count($category_ids) > 0)
+  {
+    update_category($category_ids);
+  }
+  
   trigger_action('delete_elements', $ids);
 }