Changeset 17982

Timestamp:

Sep 18, 2012, 1:46:56 PM (12 years ago)

Author:

plg

Message:

merge r17980 from trunk to branch 2.4

little code refactoring over r17424

bug fixed on Edit Photo page when associating with no album.

Location:

branches/2.4/admin

Files:

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

branches/2.4/admin/include/functions.php

@@ -1603 +1603 @@
     JOIN '.IMAGES_TABLE.' ON image_id=id
   WHERE id IN ('.implode(',', $images).')
-    '.((is_array($categories) and count($categories)>0) ? 'AND category_id NOT IN ('.implode(',', $categories).')' : null).'
+';
+  
+  if (is_array($categories) and count($categories) > 0)
+  {
+    $query.= '
+    AND category_id NOT IN ('.implode(',', $categories).')
+';
+  }
+
+  $query.= '
     AND (storage_category_id IS NULL OR storage_category_id != category_id)
 ;';

branches/2.4/admin/picture_modify.php

@@ -172 +172 @@
 
   // association to albums
+  if (!isset($_POST['associate']))
+  {
+    $_POST['associate'] = array();
+  }
   move_images_to_categories(array($_GET['image_id']), $_POST['associate']);