Projet

Général

Profil

Révision 0695d136

Ajouté par Assos Assos il y a plus de 9 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/calendar/theme/theme.inc
34 34

  
35 35
  $month_rows = $rows;
36 36
  foreach ($rows as $weekno => $row) {
37
    foreach ($row as $day => $data) {
38
      $cell = $data['data'];
39

  
40
      // If this cell is already rendered, like the weekno column,
41
      // move to the next item.
42
      if (!is_array($cell)) {
43
        $month_rows[$weekno][$day]['data'] = $cell;
44
        continue;
45
      }
46
      $data = $cell['datebox'];
47
      if ($cell['empty']) {
48
        $data .= $cell['empty'];
49
      }
50
      else {
51
        $data .= implode($cell['all_day']);
52
        foreach ($cell['items'] as $hour => $item) {
53
          $data .= implode($item);
37
    // If this row is already rendered, don't do anything.
38
    if (!isset($row['data'])) {
39
      foreach ($row as $day => $data) {
40
        $cell = $data['data'];
41

  
42
        // If this cell is already rendered, like the weekno column,
43
        // move to the next item.
44
        if (!is_array($cell)) {
45
          $month_rows[$weekno][$day]['data'] = $cell;
46
          continue;
47
        }
48
        $data = $cell['datebox'];
49
        if ($cell['empty']) {
50
          $data .= $cell['empty'];
51
        }
52
        else {
53
          $data .= implode($cell['all_day']);
54
          foreach ($cell['items'] as $hour => $item) {
55
            $data .= implode($item);
56
          }
57
          $data .= $cell['link'];
58
        }
59
        if ($view->date_info->mini) {
60
          $month_rows[$weekno][$day]['data'] = $data;
61
        }
62
        else {
63
          $month_rows[$weekno][$day]['data'] = '<div class="inner">' . $data . '</div>';
54 64
        }
55
        $data .= $cell['link'];
56
      }
57
      if ($view->date_info->mini) {
58
        $month_rows[$weekno][$day]['data'] = $data;
59
      }
60
      else {
61
        $month_rows[$weekno][$day]['data'] = '<div class="inner">' . $data . '</div>';
62 65
      }
63 66
    }
64 67
  }

Formats disponibles : Unified diff