Merge BSF 1956:1958 into branch-1_7

Small improvement:
  Random selection of pictures on notifications.

Caddie:
  Fix issue when the are not pictures attached to disassociated categories


git-svn-id: http://piwigo.org/svn/branches/branch-1_7@1959 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 3 insertions, 0 deletions

diff --git a/admin/element_set_global.php b/admin/element_set_global.php
index ad1ff8135..568a37efb 100644
--- a/admin/element_set_global.php
+++ b/admin/element_set_global.php
@@ -114,6 +114,8 @@ SELECT id
 ;';
     $dissociables = array_from_query($query, 'id');
 
+  if (!empty($dissociables))
+  {
     $query = '
 DELETE
   FROM '.IMAGE_CATEGORY_TABLE.'
@@ -121,6 +123,7 @@ DELETE
     AND image_id IN ('.implode(',', $dissociables).')
 ';
     pwg_query($query);
+  }
 
     update_category($_POST['dissociate']);
   }