Projet

Général

Profil

Révision e3063c4a

Ajouté par Assos Assos il y a environ 9 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/webform/views/webform_handler_field_form_body.inc
30 30

  
31 31
    if (node_access('view', $node)) {
32 32
      // Populate $node->content['webform'] by reference.
33
      webform_node_view($node, 'full');
33
      webform_node_view($node, 'form');
34 34
      $form_body = isset($node->content['webform']) ? drupal_render($node->content['webform']) : NULL;
35 35
    }
36 36
    else {
drupal7/sites/all/modules/webform/webform.info
24 24
files[] = tests/submission.test
25 25
files[] = tests/webform.test
26 26

  
27
; Information added by Drupal.org packaging script on 2015-03-17
28
version = "7.x-3.23"
27
; Information added by Drupal.org packaging script on 2015-04-02
28
version = "7.x-3.24"
29 29
core = "7.x"
30 30
project = "webform"
31
datestamp = "1426611477"
31
datestamp = "1427956663"
32 32

  
drupal7/sites/all/modules/webform/webform.module
1435 1435
  }
1436 1436

  
1437 1437
  // If the webform is not set to display in this view mode, return early.
1438
  // View mode of 'form' is exempted to allow blocks and views to force display.
1438 1439
  $extra_fields = field_extra_fields_get_display('node', $node->type, $view_mode);
1439
  if (empty($extra_fields['webform']['visible'])) {
1440
  if ($view_mode != 'form' && empty($extra_fields['webform']['visible'])) {
1440 1441
    return;
1441 1442
  }
1442 1443

  
......
1762 1763

  
1763 1764
  // Generate the content of the block based on display settings.
1764 1765
  if ($settings['display'] == 'form') {
1765
    webform_node_view($node, 'full');
1766
    webform_node_view($node, 'form');
1766 1767
    $content = isset($node->content['webform']) ? $node->content['webform'] : array();
1767 1768
  }
1768 1769
  else {

Formats disponibles : Unified diff