diff options
Diffstat (limited to '')
| -rw-r--r-- | admin/element_set_global.php | 31 | ||||
| -rw-r--r-- | doc/ChangeLog | 6 |
2 files changed, 26 insertions, 11 deletions
diff --git a/admin/element_set_global.php b/admin/element_set_global.php index 3dbdeda1a..7bea890ef 100644 --- a/admin/element_set_global.php +++ b/admin/element_set_global.php @@ -116,20 +116,29 @@ SELECT image_id ;'; $associated = array_from_query($query, 'image_id'); - // TODO : if $associable array is empty, no further actions $associable = array_diff($collection, $associated); - - foreach ($associable as $item) + + if (count($associable) != 0) { - array_push($datas, - array('category_id'=>$_POST['associate'], - 'image_id'=>$item)); - } + foreach ($associable as $item) + { + array_push( + $datas, + array( + 'category_id' => $_POST['associate'], + 'image_id' => $item + ) + ); + } - mass_inserts(IMAGE_CATEGORY_TABLE, - array('image_id', 'category_id'), - $datas); - update_category(array($_POST['associate'])); + mass_inserts( + IMAGE_CATEGORY_TABLE, + array('image_id', 'category_id'), + $datas + ); + + update_category(array($_POST['associate'])); + } } if ($_POST['dissociate'] != 0 and count($collection) > 0) diff --git a/doc/ChangeLog b/doc/ChangeLog index 2c4cdc95c..6a169dfb8 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,9 @@ +2005-10-25 Pierrick LE GALL + + * bug 183 fixed: Warning when trying to associate an image with an + already associated category. Just coded the TODO instructions I + had let some time ago. + 2005-10-23 chrisaga * bug 184 fixed: .png button left aligned in IE |