From 8a97ff299e36b1b9a8b555ca91c6e040abd58010 Mon Sep 17 00:00:00 2001
From: rub <rub@piwigo.org>
Date: Sat, 14 Apr 2007 12:34:44 +0000
Subject: [PATCH] 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
---
 admin/element_set_global.php           | 3 +++
 include/functions_notification.inc.php | 1 +
 2 files changed, 4 insertions(+)

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']);
   }
diff --git a/include/functions_notification.inc.php b/include/functions_notification.inc.php
index c744e046b..5462f43e2 100644
--- a/include/functions_notification.inc.php
+++ b/include/functions_notification.inc.php
@@ -478,6 +478,7 @@ SELECT DISTINCT id, path, name, tn_ext, file
   '.$where_sql.'
     AND date_available="'.$dates[$i]['date_available'].'"
     AND tn_ext IS NOT NULL
+  ORDER BY RAND(NOW())
   LIMIT 0,'.$max_elements.'
 ;';
       $dates[$i]['elements'] = array();