diff options
author | plegall <plg@piwigo.org> | 2009-06-02 20:22:45 +0000 |
---|---|---|
committer | plegall <plg@piwigo.org> | 2009-06-02 20:22:45 +0000 |
commit | 65e10b68d58f4d3be2ce7d4f6946dae0745a7310 (patch) | |
tree | 79c1fe8b817286bc3b31e24473fb70882ac76942 | |
parent | 654ce203d3290c524adb797208d4e3037c0f5407 (diff) |
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
Diffstat (limited to '')
-rw-r--r-- | admin/picture_modify.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/picture_modify.php b/admin/picture_modify.php index 9e7c063f5..c142ae955 100644 --- a/admin/picture_modify.php +++ b/admin/picture_modify.php @@ -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); |