Changeset 2575 for trunk/admin/picture_modify.php

Timestamp:

Sep 23, 2008, 11:26:36 PM (16 years ago)

Author:

plg

Message:

bug fixed: now that WebService method pwg.images.add create image records
with no storage_category_id, we allow this field to be null in the
administration code.

File:

• trunk/admin/picture_modify.php (modified) (2 diffs)

trunk/admin/picture_modify.php

@@ -178 +178 @@
 $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'];
 
@@ -398 +403 @@
   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))
 {