summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaren Stevenson2008-10-07 11:55:17 (GMT)
committer Karen Stevenson2008-10-07 11:55:17 (GMT)
commit3df4c3bb48f65cbf6c7440bc326dcb19288ae7ae (patch)
tree609fbb3537351ba10ac6854bc3056a7f8909f955
parent87c86cf83cbd3c08be4304be924a73fe3ec8d201 (diff)
#316656 Default weight must be zero, not NULL, or form ordering will be incorrect.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--includes/content.crud.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 14aa076..9d2b6dc 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@
CCK 6.2-dev
===========
+- #316656 Default weight must be zero, not NULL, or form ordering will be incorrect.
- #107407 by dopry, optimization patch, do nothing in hook_form_alter() and hook_nodeapi() if there are no fields.
- #317932 Fix userreference documentation typo.
diff --git a/includes/content.crud.inc b/includes/content.crud.inc
index 6e36626..829604d 100644
--- a/includes/content.crud.inc
+++ b/includes/content.crud.inc
@@ -109,7 +109,7 @@ function content_field_instance_expand($field) {
}
$field['widget'] = !empty($field['widget_settings']) ? $field['widget_settings'] : array();
$field['widget']['label'] = !empty($field['label']) ? $field['label'] : $field['field_name'];
- $field['widget']['weight'] = !empty($field['weight']) ? $field['weight'] : NULL;
+ $field['widget']['weight'] = !empty($field['weight']) ? $field['weight'] : 0;
$field['widget']['description'] = !empty($field['description']) ? $field['description'] : '';
if (!empty($field['widget_type'])) {