Changeset 8827 for extensions/pwg_images_addSimple

Timestamp:

Jan 21, 2011, 2:47:54 PM (14 years ago)

Author:

plg

Message:

bug fixed: no crash when calling pwg.categories.delete on an empty album

File:

• extensions/pwg_images_addSimple/main.inc.php (modified) (3 diffs)

extensions/pwg_images_addSimple/main.inc.php

@@ -365 +365 @@
   $image_ids_linked = array_from_query($query, 'image_id');
 
-  $query = '
+  if (count($image_ids_linked) > 0)
+  {
+    $query = '
 SELECT
     DISTINCT(image_id)
@@ -372 +374 @@
     AND category_id NOT IN ('.implode(',', $all_category_ids).')
 ;';
-  $image_ids_not_orphans = array_from_query($query, 'image_id');
-
-  $image_ids_orphans = array_diff($image_ids_linked, $image_ids_not_orphans);
-  
-  // print_r($image_ids_not_orphans); exit();
+    $image_ids_not_orphans = array_from_query($query, 'image_id');
+    $image_ids_orphans = array_diff($image_ids_linked, $image_ids_not_orphans);
+  
+    // print_r($image_ids_not_orphans); exit();
+  }
 
   include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
@@ -382 +384 @@
   update_global_rank();
 
-  delete_elements($image_ids_orphans, true);
+  if (isset($image_ids_orphans))
+  {
+    delete_elements($image_ids_orphans, true);
+  }
 }