archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug fixed: now that WebService method pwg.images.add create image records

Browse source 
with no storage_category_id, we allow this field to be null in the
administration code.


git-svn-id: http://piwigo.org/svn/trunk@2575 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2008-09-23 21:26:36 +00:00
commit 52f0cce24f
4 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
admin/picture_modify.php
View file

@ -177,7 +177,12 @@ SELECT *
;';
$row = mysql_fetch_array(pwg_query($query));
$storage_category_id = $row['storage_category_id'];
$storage_category_id = null;
if (!empty($row['storage_category_id']))
{
$storage_category_id = $row['storage_category_id'];
}
$image_file = $row['file'];
// tags
@ -397,13 +402,22 @@ $query = '
SELECT id,name,uppercats,global_rank
FROM '.CATEGORIES_TABLE.'
INNER JOIN '.IMAGE_CATEGORY_TABLE.' ON id = category_id
WHERE image_id = '.$_GET['image_id'].'
AND id != '.$storage_category_id.'
WHERE image_id = '.$_GET['image_id'];
if (isset($storage_category_id))
{
$query.= '
AND id != '.$storage_category_id;
}
$query.= '
;';
display_select_cat_wrapper($query, array(), 'associated_options');
$result = pwg_query($query);
$associateds = array($storage_category_id);
$associateds = array();
if (isset($storage_category_id))
{
array_push($associateds, $storage_category_id);
}
while ($row = mysql_fetch_array($result))
{
array_push($associateds, $row['id']);