diff options
| author | cash <cash.costello@gmail.com> | 2011-06-29 20:52:46 -0400 |
|---|---|---|
| committer | cash <cash.costello@gmail.com> | 2011-06-29 20:52:46 -0400 |
| commit | b1ef9493829d407f87b8cc14810ccdac07d345a8 (patch) | |
| tree | 233fff58ad2f389a3073291a6a35ffdacee544f2 | |
| parent | 0a013cd9833a20d3b6334d80dba581bbbb2ce756 (diff) | |
| download | elgg-b1ef9493829d407f87b8cc14810ccdac07d345a8.tar.gz elgg-b1ef9493829d407f87b8cc14810ccdac07d345a8.tar.bz2 | |
removed uses of extend_view() and some checks for whether a function exists
| -rw-r--r-- | show_events.php | 2 | ||||
| -rw-r--r-- | start.php | 21 | ||||
| -rw-r--r-- | views/default/event_calendar/forms/manage_event.php | 2 |
3 files changed, 11 insertions, 14 deletions
diff --git a/show_events.php b/show_events.php index 4d8f09702..d3cd8c76a 100644 --- a/show_events.php +++ b/show_events.php @@ -156,7 +156,7 @@ if ($filter == 'all') { $events = event_calendar_get_events_for_user_between($start_ts,$end_ts,false,$limit,$offset,$user_guid,$group_guid,$region); } -extend_view('metatags','event_calendar/metatags'); +elgg_extend_view('metatags','event_calendar/metatags'); $vars = array( 'original_start_date' => $original_start_date, 'start_date' => $start_date, @@ -33,8 +33,7 @@ register_entity_url_handler('event_calendar_url','object', 'event_calendar'); // Register granular notification for this type - if (is_callable('register_notification_object')) - register_notification_object('object', 'event_calendar', elgg_echo('event_calendar:new_event')); + register_notification_object('object', 'event_calendar', elgg_echo('event_calendar:new_event')); // Set up menu for users if (isloggedin()) { @@ -53,26 +52,24 @@ if (!$group_calendar || $group_calendar != 'no') { $group_profile_display = get_plugin_setting('group_profile_display', 'event_calendar'); if (!$group_profile_display || $group_profile_display == 'right') { - extend_view('groups/right_column', 'event_calendar/groupprofile_calendar'); + elgg_extend_view('groups/right_column', 'event_calendar/groupprofile_calendar'); } else if ($group_profile_display == 'left') { - extend_view('groups/left_column', 'event_calendar/groupprofile_calendar'); + elgg_extend_view('groups/left_column', 'event_calendar/groupprofile_calendar'); } } //add to the css - extend_view('css', 'event_calendar/css'); + elgg_extend_view('css', 'event_calendar/css'); //add a widget add_widget_type('event_calendar',elgg_echo("event_calendar:widget_title"),elgg_echo('event_calendar:widget:description')); // add the event calendar group tool option - if (function_exists('add_group_tool_option')) { - $event_calendar_group_default = get_plugin_setting('group_default', 'event_calendar'); - if (!$event_calendar_group_default || ($event_calendar_group_default == 'yes')) { - add_group_tool_option('event_calendar',elgg_echo('event_calendar:enable_event_calendar'),true); - } else { - add_group_tool_option('event_calendar',elgg_echo('event_calendar:enable_event_calendar'),false); - } + $event_calendar_group_default = get_plugin_setting('group_default', 'event_calendar'); + if (!$event_calendar_group_default || ($event_calendar_group_default == 'yes')) { + add_group_tool_option('event_calendar',elgg_echo('event_calendar:enable_event_calendar'),true); + } else { + add_group_tool_option('event_calendar',elgg_echo('event_calendar:enable_event_calendar'),false); } // if autogroup is set, listen and respond to join/leave events diff --git a/views/default/event_calendar/forms/manage_event.php b/views/default/event_calendar/forms/manage_event.php index 35b9dba71..f9d78e3f4 100644 --- a/views/default/event_calendar/forms/manage_event.php +++ b/views/default/event_calendar/forms/manage_event.php @@ -11,7 +11,7 @@ * */ -extend_view('metatags','event_calendar/metatags'); +elgg_extend_view('metatags','event_calendar/metatags'); $body = elgg_view('event_calendar/forms/manage_event_content',$vars); |