--- webform-old.module  Wed Jan  5 10:23:25 2005
+++ webform.module      Wed Jan  5 10:22:19 2005
@@ -190,7 +190,7 @@
   $result = db_query('SELECT cid, name, type, value, extra, mandatory, weight '.
                      ' FROM {webform_component} '.
                      ' WHERE nid = %d '.
-                     ' ORDER BY weight', $node->nid);
+                     ' ORDER BY weight, name', $node->nid);
   while($c = db_fetch_array($result)) {
     $page->webformcomponents_name[$c['cid']] = $c['name'];
     $page->webformcomponents_type[$c['cid']] = $c['type'];
@@ -376,7 +376,8 @@
                                        t('To delete a component, check its "selected" box and press "Delete selected".'),
                                        t('Use "value" to enter a default value.'),
                                        t('Check "mandatory" box if the field should be mandatory.'),
-                                       t('Remember to set weight on the components or they will be added to the form in a random order.')
+                                       t('Remember to set weight on the components or they will be added to the form in a random order.'),
+                                      t('The components are sorted first by weight and then by name.')
                                        )
                                  );
     $output .= form_item(t('Form components'), $help_text);