Projet

Général

Profil

Révision c7b88c87

Ajouté par Assos Assos il y a presque 9 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/date_ical/includes/date_ical_plugin_style_ical_feed.inc
291 291 
                'year' =>  $addition_array['year'],
292 292 
                'month' => $addition_array['month'],
293 293 
                'day' =>   $addition_array['day'],
294 
                // Use the time information from the start date, since Date
295 
                // doesn't store time info for RDATEs.
296 
                'hour' =>   $start['hour'],
297 
                'min' =>    $start['minute'],
298 
                'second' => $start['second'],
294 
                // If the user's copy of Date has support for time in RDATEs,
295 
                // use that. Otherwise use the time from the start date.
296 
                'hour' =>   isset($addition_array['hour']) ? $addition_array['hour'] : $start['hour'],
297 
                'min' =>    isset($addition_array['minute']) ? $addition_array['minute'] : $start['minute'],
298 
                'second' => isset($addition_array['second']) ? $addition_array['second'] : $start['second'],
299 299 
                'tz' =>     $start['tz']->getName(),
300 300 
              );
301 301
......
308 308 
                  'year' =>  $addition_array['year'],
309 309 
                  'month' => $addition_array['month'],
310 310 
                  'day' =>   $addition_array['day'],
311 
                  // Use the time information from the end date.
312 
                  'hour' =>   $end['hour'],
313 
                  'min' =>    $end['minute'],
314 
                  'second' => $end['second'],
311 
                  // If the user's copy of Date has support for time in RDATEs,
312 
                  // use that. Otherwise use the time from the end date.
313 
                  'hour' =>   isset($addition_array['hour']) ? $addition_array['hour'] : $end['hour'],
314 
                  'min' =>    isset($addition_array['minute']) ? $addition_array['minute'] : $end['minute'],
315 
                  'second' => isset($addition_array['second']) ? $addition_array['second'] : $end['second'],
315 316 
                  'tz' =>     $end['tz']->getName(),
316 317 
                );
317 318 
                $rdate = $rdate_with_end;
......
405 406 
      }
406 407 
    }
407 408
408 
    // These steps shouldn't be run when during Preview on the View page.
409 
    // These steps shouldn't be run during Preview on the View page.
409 410 
    if (empty($this->view->live_preview)) {
410 411 
      // Prevent devel module from appending queries to ical export.
411 412 
      $GLOBALS['devel_shutdown'] = FALSE;

Formats disponibles : Unified diff