Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

4 files changed, 23 insertions, 33 deletions

diff --git a/views/ical/export/entity.php b/views/ical/export/entity.php
index caa60c7a5..eaa3b56d8 100644
--- a/views/ical/export/entity.php
+++ b/views/ical/export/entity.php
@@ -9,23 +9,25 @@
 
 $entity = $vars['entity'];
 
-if (
-	($entity instanceof Notable) &&
-	($entity->getCalendarStartTime()) &&
-	($entity->getCalendarEndTime())
-)
-{
-?>
+if ($entity instanceof Notable &&
+	$entity->getCalendarStartTime() &&
+	$entity->getCalendarEndTime()) {
+
+	$timestamp = date("Ymd\THis\Z", $entity->getTimeCreated());
+	$start = date("Ymd\THis\Z", $entity->getCalendarStartTime());
+	$end = date("Ymd\THis\Z", $entity->getCalendarEndTime());
+	$summary = $entity->title;
+	$modified = date("Ymd\THis\Z", $entity->getTimeUpdated());
+
+	echo <<< ICAL
 BEGIN:VEVENT
-DTSTAMP:<?php echo date("Ymd\THis\Z", $entity->getTimeCreated());  ?>
-DTSTART:<?php echo date("Ymd\THis\Z", $entity->getCalendarStartTime());  ?>
-DTEND:<?php echo date("Ymd\THis\Z", $entity->getCalendarEndTime());  ?>
-SUMMARY:<?php echo $event->title; ?>
-LAST-MODIFIED:<?php echo date("Ymd\THis\Z", $entity->getTimeUpdated());  ?>
+DTSTAMP:$timestamp
+DTSTART:$start
+DTEND:$end
+SUMMARY:$summary
+LAST-MODIFIED:$modified
 END:VEVENT
-<?php
-}
-?>
-	if (
 
-	)
\ No newline at end of file
+ICAL;
+
+}
diff --git a/views/ical/object/default.php b/views/ical/object/default.php
index 678676133..77183bb8a 100644
--- a/views/ical/object/default.php
+++ b/views/ical/object/default.php
@@ -7,4 +7,4 @@
  *
  */
 
-elgg_view('export/entity', $vars);
\ No newline at end of file
+echo elgg_view('export/entity', $vars);
\ No newline at end of file
diff --git a/views/ical/page/default.php b/views/ical/page/default.php
index 9a529b24f..01bd9e86e 100644
--- a/views/ical/page/default.php
+++ b/views/ical/page/default.php
@@ -7,12 +7,13 @@
  *
  */
 
+$site = elgg_get_site_entity();
+
 header("Content-Type: text/calendar");
 
-echo $vars['body'];
 ?>
 BEGIN:VCALENDAR
 VERSION:2.0
-PRODID:-//Curverider Ltd//NONSGML Elgg <?php echo get_version(true); ?>//EN
+PRODID:-//Elgg//NONSGML <?php echo $site->name; ?>//EN
 <?php echo $vars['body']; ?>
 END:VCALENDAR
diff --git a/views/ical/search/entity_list.php b/views/ical/search/entity_list.php
deleted file mode 100644
index 38c19fbb7..000000000
--- a/views/ical/search/entity_list.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/**
- * Elgg default layout
- *
- * @package Elgg
- * @subpackage Core
- */
-
-$entities = $vars['entities'];
-if (is_array($entities) && sizeof($entities) > 0) {
-	foreach($entities as $entity)
-		echo elgg_view_entity($entity);
-}
\ No newline at end of file