summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaren Stevenson2012-04-19 00:16:09 (GMT)
committer Karen Stevenson2012-04-19 00:16:09 (GMT)
commit4389f3d9546f80f35dd5ef5246ac25c76ec070ad (patch)
tree9e6a57a42aa632e3b854abd2065b58e880f9ca0c
parent9e41bebd3cb44d6669fc6f80f7d095b29d4ccf32 (diff)
Issue #1397986, Fix Undefined index groupby_times.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--theme/theme.inc8
2 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c0a8607..d91bc8c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -33,6 +33,7 @@ If you have an existing calendar you can add the menu tabs and turn on the date
BUGFIXES:
+- Issue #1397986, Fix Undefined index groupby_times.
- Issue #1466698 by alex.neblett and johnv, Make sure that all available fields appear on the template, even when shared across entity types.
- The group by field option was not working right, fix it.
- The calendar legend block was appearing even if empty. Create the content earlier to keep that from happening.
diff --git a/theme/theme.inc b/theme/theme.inc
index ac7128b..5d09220 100644
--- a/theme/theme.inc
+++ b/theme/theme.inc
@@ -264,11 +264,11 @@ function template_preprocess_calendar_day(&$vars) {
foreach ($grouped_items[$start_time]['values'] as $column => &$items) {
foreach ($items as $index => &$item) {
if ($display_overlap) {
- if ($view->style_options['groupby_times'] == 'half'){
+ if ($view->date_info->style_groupby_times == 'half'){
$group_time = 30;
$divisor = 7.5;
}
- else if ($view->style_options['groupby_times'] == 'hour'){
+ else if ($view->date_info->style_groupby_times == 'hour'){
$group_time = 60;
$divisor = 15;
} else {
@@ -473,11 +473,11 @@ function template_preprocess_calendar_week(&$vars) {
foreach ($grouped_items[$start_time]['values'] as $wday => &$items) {
foreach ($items as &$item) {
if ($display_overlap) {
- if ($view->style_options['groupby_times'] == 'half'){
+ if ($view->date_info->style_groupby_times == 'half'){
$group_time = 30;
$divisor = 7.5;
}
- else if ($view->style_options['groupby_times'] == 'hour'){
+ else if ($view->date_info->style_groupby_times == 'hour'){
$group_time = 60;
$divisor = 15;
} else {