Commit ec7c3ea4 authored by git's avatar git Committed by Joël Pittet
Browse files

Issue #3217106 by larisse, manuga, snaphuman, jplana: The year view from... 

Issue #3217106 by larisse, manuga, snaphuman, jplana: The year view from calendar generate html code incorrect
parent a38c9efb

calendar.theme.inc

+1 −6
Original line number Diff line number Diff line
@@ -54,13 +54,8 @@ function template_preprocess_calendar_month(&$vars) { 
          }

          $data[] = $cell['link'];

        }

        if ($view->styleInfo->isMini()) {

        $month_rows[$weekno][$day]['data'] = \Drupal::service('renderer')->render($data);

      }

        else {

          $month_rows[$weekno][$day]['data'] = '<div class="inner">' . \Drupal::service('renderer')->render($data) . '</div>';

        }

      }

    }

  }

src/CalendarHelper.php

+15 −13
Original line number Diff line number Diff line
@@ -959,8 +959,9 @@ class CalendarHelper extends DateHelper { 
    $route_parameters = [];

    $path = $view->getPath();

    $views_arguments = $view->args;

    $bits = explode('/', $path);

    $bits = is_string($path) ? explode('/', $path) : false;

    $arg_counter = 0;

    if ($bits != false) {

      foreach ($bits as $pos => $bit) {

        if ($bit == '%') {

          // Generate the name of the parameter using the key of the argument
@@ -975,6 +976,7 @@ class CalendarHelper extends DateHelper { 
          $arg_counter++;

        }

      }

    }

    for ($i = $arg_counter; $i < $i + count($args); $i++) {

      $route_parameters['arg_' . $i] = array_shift($args);

    }