Project

General

Profile

Revision 01f36513

Added by Assos Assos about 6 years ago

Weekly update of contrib modules

View differences:

drupal7/sites/all/modules/webform/includes/webform.components.inc
159 159

  
160 160
  $form['components']['#attached']['library'][] = array('webform', 'admin');
161 161

  
162
  // TODO: Attach these. See http://drupal.org/node/732022.
162
  // @todo: Attach these. See http://drupal.org/node/732022.
163 163
  drupal_add_tabledrag('webform-components', 'order', 'sibling', 'webform-weight');
164 164
  drupal_add_tabledrag('webform-components', 'match', 'parent', 'webform-pid', 'webform-pid', 'webform-cid');
165 165

  
......
281 281
/**
282 282
 * Theme the node components form. Use a table to organize the components.
283 283
 *
284
 * @return
284
 * @return string
285 285
 *   Formatted HTML form, ready for display.
286 286
 */
287 287
function theme_webform_components_form($variables) {
......
579 579
  );
580 580

  
581 581
  // Add the fields specific to this component type:
582
  $additional_form_elements = (array) webform_component_invoke($component['type'], 'edit', $component);
582
  $additional_form_elements = (array) webform_component_invoke($component['type'], 'edit', $component, $form, $form_state);
583 583
  if (empty($additional_form_elements)) {
584 584
    drupal_set_message(t('The webform component of type @type does not have an edit function defined.', array('@type' => $component['type'])));
585 585
  }
......
1039 1039
 *   returned list of options.
1040 1040
 *
1041 1041
 * @return array
1042
 *   An array of options.
1042 1043
 */
1043 1044
function webform_component_list($node, $component_filter = NULL, $prepend_group = TRUE, $pagebreak_groups = FALSE) {
1044 1045
  $options = array();

Also available in: Unified diff