Changeset 1428 for trunk

Timestamp:

Jul 4, 2006, 12:53:26 AM (18 years ago)

Author:

plg

Message:

merge -r1426:1427 from branch 1.6 to trunk (bug 397 fixed: [...] type
comparison with operator "==").

File:

• trunk/admin/include/functions.php (modified) (2 diffs)

trunk/admin/include/functions.php

@@ -608 +608 @@
       }
 
-      if (!isset($insert[$dbfield]) or $insert[$dbfield] == '')
+      if (!isset($insert[$dbfield]) or $insert[$dbfield] === '')
       {
         $query.= 'NULL';
@@ -941 +941 @@
 ;';
     list($representative) = mysql_fetch_array(pwg_query($query));
-    $data = array('id' => $category_id,
-                  'representative_picture_id' => $representative);
-    array_push($datas, $data);
-  }
-
-  $fields = array('primary' => array('id'),
-                  'update' => array('representative_picture_id'));
-  mass_updates(CATEGORIES_TABLE, $fields, $datas);
+
+    array_push(
+      $datas,
+      array(
+        'id' => $category_id,
+        'representative_picture_id' => $representative,
+        )
+      );
+  }
+
+  mass_updates(
+    CATEGORIES_TABLE,
+    array(
+      'primary' => array('id'),
+      'update' => array('representative_picture_id')
+      ),
+    $datas
+    );
 }