Skip to content

Commit

Permalink
merge r3389 from branch 2.0 to trunk
Browse files Browse the repository at this point in the history
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
  • Loading branch information
plegall committed Jun 2, 2009
1 parent 654ce20 commit 65e10b6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion admin/picture_modify.php
Expand Up @@ -412,7 +412,7 @@
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);
Expand Down

0 comments on commit 65e10b6

Please sign in to comment.