Changeset 1959 for branches

Timestamp:

Apr 14, 2007, 2:34:44 PM (18 years ago)

Author:

rub

Message:

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

Location:

branches/branch-1_7

Files:

• admin/element_set_global.php (modified) (2 diffs)
• include/functions_notification.inc.php (modified) (1 diff)

branches/branch-1_7/admin/element_set_global.php

@@ -115 +115 @@
     $dissociables = array_from_query($query, 'id');
 
+  if (!empty($dissociables))
+  {
     $query = '
 DELETE
@@ -122 +124 @@
 ';
     pwg_query($query);
+  }
 
     update_category($_POST['dissociate']);

branches/branch-1_7/include/functions_notification.inc.php

@@ -479 +479 @@
     AND date_available="'.$dates[$i]['date_available'].'"
     AND tn_ext IS NOT NULL
+  ORDER BY RAND(NOW())
   LIMIT 0,'.$max_elements.'
 ;';