aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2005-10-25 20:50:14 +0000
committerplegall <plg@piwigo.org>2005-10-25 20:50:14 +0000
commitf74420a36a66d380241c12c265d5b83f1c0e8ea4 (patch)
tree9644caea49d8bb51bf3ba52c7571709da2eaf150 /admin
parent32f1a5d6ecb7d6f0ead2052937dab80a4d635e27 (diff)
- 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. git-svn-id: http://piwigo.org/svn/trunk@916 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/element_set_global.php31
1 files changed, 20 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)