iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

little code refactoring over r17424

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


git-svn-id: http://piwigo.org/svn/trunk@17980 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2012-09-18 11:43:36 +00:00
parent a12e006c89
commit a1002f61fd
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
admin/include/functions.php
View File

@@ -1602,7 +1602,16 @@ DELETE '.IMAGE_CATEGORY_TABLE.'.*
FROM '.IMAGE_CATEGORY_TABLE.'
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)
;';
pwg_query($query);

4
admin/picture_modify.php
View File

@@ -171,6 +171,10 @@ if (isset($_POST['submit']) and count($page['errors']) == 0)
set_tags($tag_ids, $_GET['image_id']);
// association to albums
if (!isset($_POST['associate']))
{
$_POST['associate'] = array();
}
move_images_to_categories(array($_GET['image_id']), $_POST['associate']);
// thumbnail for albums