commit 0f9a5815fe2d584ef750b3325b1da52365ea7d21 Author: Joel Pittet Date: Mon Apr 8 21:38:24 2013 -0700 got the right variables diff --git a/core/modules/views/views.module b/core/modules/views/views.module index 2d5727f..b456a0e 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -1409,24 +1409,22 @@ function views_form_views_form_submit($form, &$form_state) { * * @param array $element * An associative array containing the properties of the element. - * Properties used: #substitutions, @todo. + * Properties used: #substitutions, #children. * @return array * The $element with prepared variables ready for #theme 'form' in views_form_views_form. */ function views_pre_render_views_form_views_form($element) { - $form = $element['form']; - // Placeholders and their substitutions (usually rendered form elements). $search = array(); $replace = array(); // Add in substitutions provided by the form. - foreach ($form['#substitutions']['#value'] as $substitution) { + foreach ($element['#substitutions']['#value'] as $substitution) { $field_name = $substitution['field_name']; $row_id = $substitution['row_id']; $search[] = $substitution['placeholder']; - $replace[] = isset($form[$field_name][$row_id]) ? drupal_render($form[$field_name][$row_id]) : ''; + $replace[] = isset($element[$field_name][$row_id]) ? drupal_render($element[$field_name][$row_id]) : ''; } // Add in substitutions from hook_views_form_substitutions(). $substitutions = Drupal::moduleHandler()->invokeAll('views_form_substitutions'); @@ -1436,10 +1434,10 @@ function views_pre_render_views_form_views_form($element) { } // Apply substitutions to the rendered output. - $form['output']['#markup'] = str_replace($search, $replace, $form['output']['#markup']); + $element['output']['#markup'] = str_replace($search, $replace, $element['output']['#markup']); // Render and add remaining form fields. - $element['#children'] = drupal_render_children($form); + $element['#children'] = drupal_render_children($element); return $element; }