merge r3389 from branch 2.0 to trunk

bug 1022 fixed: a photo can be associateed to no category (now that a photo
can have NULL as storage_category_id, it's possible to have no associated
category), the admin/picture_modify doesn't break anymore.

git-svn-id: http://piwigo.org/svn/trunk@3390 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2009-06-02 20:22:45 +00:00
parent 654ce203d3
commit 65e10b68d5
+1 -1
View File
@@ -412,7 +412,7 @@ $query.= '
display_select_cat_wrapper($query, array(), 'associated_options');
$result = pwg_query($query);
$associateds = array();
$associateds = array(-1);
if (isset($storage_category_id))
{
array_push($associateds, $storage_category_id);