summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--date_api/theme/date-valarm.tpl.php5
-rw-r--r--date_api/theme/date-vcalendar.tpl.php3
-rw-r--r--date_api/theme/date-vevent.tpl.php6
4 files changed, 6 insertions, 9 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a759651..ea67816 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,6 +5,7 @@ Date Module 7.x
Version 7.x-2.x-dev
===================
+- Follow up to Issue #1302052 by benjifisher, More clean up of ical line endings.
- Issue #1388174 by travist, Remove redundant use of date_default_timezone().
- Issue #1388586 by Moloc, Don't use check_plain() on system messages with links.
- Issue #1302052 by benjifisher, penguin25, and helmo, Fix linespace ending problems in ical files.
diff --git a/date_api/theme/date-valarm.tpl.php b/date_api/theme/date-valarm.tpl.php
index 1711913..7591269 100644
--- a/date_api/theme/date-valarm.tpl.php
+++ b/date_api/theme/date-valarm.tpl.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/**
* $alarm
* An array with the following information about each alarm:
@@ -31,7 +30,7 @@ if (!empty($alarm['duration'])):
endif;
if ($alarm['action'] == 'EMAIL'):
print "ATTENDEE:MAILTO:" . $alarm['email'] . "\r\n";
- print "SUMMARY:" . $alarm['summary'] . "\n";
+ print "SUMMARY:" . $alarm['summary'] . "\r\n";
endif;
print "DESCRIPTION:" . $alarm['description'] . "\r\n";
-print "END:VALARM\r\n"; \ No newline at end of file
+print "END:VALARM\r\n";
diff --git a/date_api/theme/date-vcalendar.tpl.php b/date_api/theme/date-vcalendar.tpl.php
index df4aa22..ecf7ae3 100644
--- a/date_api/theme/date-vcalendar.tpl.php
+++ b/date_api/theme/date-vcalendar.tpl.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/**
* $calname
* The name of the calendar.
@@ -21,7 +20,7 @@ if (!empty($calname)) {
print "X-WR-CALNAME;VALUE=TEXT:$calname\r\n";
}
print "PRODID:-//Drupal iCal API//EN\r\n";
-// Note that theme('date_event') already has the right line endings and needs no more.
+// Note that theme('date_vevent') already has the right line endings and needs no more.
foreach($events as $event):
print theme('date_vevent', $event);
endforeach;
diff --git a/date_api/theme/date-vevent.tpl.php b/date_api/theme/date-vevent.tpl.php
index 8b3c7bb..7142167 100644
--- a/date_api/theme/date-vevent.tpl.php
+++ b/date_api/theme/date-vevent.tpl.php
@@ -1,5 +1,4 @@
<?php
-// $Id$
/**
* $event
* An array with the following information about each event:
@@ -19,8 +18,7 @@
* If you are editing this file, remember that all output lines generated by it
* must end with DOS-style \r\n line endings, and not Unix-style \n, in order to
* be compliant with the iCal spec (see http://tools.ietf.org/html/rfc5545#section-3.1)
-
- */
+ **/
$date = date_now('UTC');
$current_date = !empty($event['current_date']) ? $event['current_date'] : $date->format(DATE_FORMAT_ICAL);
print "BEGIN:VEVENT\r\n";
@@ -43,4 +41,4 @@ if (!empty($event['location'])) {
if (!empty($event['description'])) {
print "DESCRIPTION:" . $event['description'] . "\r\n";
}
-print "END:VEVENT\r\n"; \ No newline at end of file
+print "END:VEVENT\r\n";