summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaren Stevenson2012-02-23 12:34:42 (GMT)
committer Karen Stevenson2012-02-23 12:34:42 (GMT)
commit1d648a34edb97ac2218f5ae5f3fb533d123c8a74 (patch)
tree0ceb79b3b881a73b46d0caeab2e8cbc84cb0be2a
parent5c088bc0dbffe036da001904e661b543fef43afb (diff)
Issue #1439832 by Dave Reid and HorsePunchKid, Undefined index error 'redirect' when using redirect module.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--includes/calendar.views_template.inc3
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7fab144..fcc1ff8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,6 +5,7 @@ Calendar Module 7.x
Version 7.x-3.x-dev
===================
+- Issue #1439832 by Dave Reid and HorsePunchKid, Undefined index error 'redirect' when using redirect module.
- Switch to using entity_lable() and entity_uri() in row handler.
- Issue #1284170 by benjifisher, Lots of cleanup of the iCal export and its template to be sure all day items are exported correctly.
- Issue #1346424, The calendar title got left out of the latest ical template changes.
diff --git a/includes/calendar.views_template.inc b/includes/calendar.views_template.inc
index 62cfeb1..97855a1 100644
--- a/includes/calendar.views_template.inc
+++ b/includes/calendar.views_template.inc
@@ -24,6 +24,9 @@ function calendar_views_templates() {
$processed = array();
foreach ($entity_info as $entity_type => $info) {
+ if (!$info['fieldable']) {
+ continue;
+ }
$items = field_info_instances($entity_type);
$views_fields = date_views_fields($info['base table']);
foreach ($views_fields['name'] as $name => $data) {