removed uses of extend_view() and some checks for whether a function exists

diff --git a/show_events.php b/show_events.php
index 4d8f097026b52c4ede52589e7b4c3cb57ca153b2..d3cd8c76af77ab4613008f35d531e1a15fda2e8a 100644 (file)
--- 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,

diff --git a/start.php b/start.php
index d12f568486016a5e77d7cfcb99d348699b3708fd..57007fa773a0da6ec89bae3273bde4f6a2a31bfb 100644 (file)
--- a/start.php
+++ b/start.php
@@ -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 35b9dba71de0fa476c8b6af72a00bcbb4d3fbced..f9d78e3f41a5ebaf2cd372b8728014382404b37e 100644 (file)
--- 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);