diff options
| author | Kevin Jardine <kevinjardine@yahoo.com> | 2011-10-19 19:56:43 +0200 |
|---|---|---|
| committer | Kevin Jardine <kevinjardine@yahoo.com> | 2011-10-19 19:56:43 +0200 |
| commit | 1ca017f9f9f8b44fbdcb08105a52e059df6bb504 (patch) | |
| tree | 0d736333adcead39658fe9e33f16c89feb8add83 /models | |
| parent | 9fe3317951c5582e381bc4ab7b6b21f54ec26b36 (diff) | |
| download | elgg-1ca017f9f9f8b44fbdcb08105a52e059df6bb504.tar.gz elgg-1ca017f9f9f8b44fbdcb08105a52e059df6bb504.tar.bz2 | |
added proper check for group enabled calendar and renamed some deprecated functions
Diffstat (limited to 'models')
| -rw-r--r-- | models/model.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/models/model.php b/models/model.php index f2f48ca11..7f6c3d39d 100644 --- a/models/model.php +++ b/models/model.php @@ -859,8 +859,8 @@ function event_calendar_format_time($date,$time1,$time2='') { } function event_calendar_activated_for_group($group) { - $group_calendar = get_plugin_setting('group_calendar', 'event_calendar'); - $group_default = get_plugin_setting('group_default', 'event_calendar'); + $group_calendar = elgg_get_plugin_setting('group_calendar', 'event_calendar'); + $group_default = elgg_get_plugin_setting('group_default', 'event_calendar'); if ($group && ($group_calendar != 'no')) { if ( ($group->event_calendar_enable == 'yes') || ((!$group->event_calendar_enable && (!$group_default || $group_default == 'yes')))) { return true; @@ -870,7 +870,7 @@ function event_calendar_activated_for_group($group) { } function event_calendar_get_region($event) { - $event_calendar_region_list_handles = get_plugin_setting('region_list_handles', 'event_calendar'); + $event_calendar_region_list_handles = elgg_get_plugin_setting('region_list_handles', 'event_calendar'); $region = trim($event->region); if ($event_calendar_region_list_handles == 'yes') { $region = elgg_echo('event_calendar:region:'.$region); @@ -879,7 +879,7 @@ function event_calendar_get_region($event) { } function event_calendar_get_type($event) { - $event_calendar_type_list_handles = get_plugin_setting('type_list_handles', 'event_calendar'); + $event_calendar_type_list_handles = elgg_get_plugin_setting('type_list_handles', 'event_calendar'); $type = trim($event->event_type); if ($event_calendar_type_list_handles == 'yes') { $type = elgg_echo('event_calendar:type:'.$type); |