Removed deprecated function uses.

6 files changed, 11 insertions, 11 deletions

diff --git a/models/model.php b/models/model.php
index 09e8b2092..7b4698f98 100644
--- a/models/model.php
+++ b/models/model.php
@@ -2071,7 +2071,7 @@ function event_calendar_handle_menu($event_guid) {
 		$item = new ElggMenuItem('event-calendar-0review_requests', elgg_echo('event_calendar:review_requests_menu_title'), $url);
 		$item->setSection('event_calendar');
 		elgg_register_menu_item('page', $item);
-		//add_submenu_item(elgg_echo('event_calendar:review_requests_title'), $CONFIG->wwwroot . "pg/event_calendar/review_requests/".$event_id, '0eventcalendaradmin');
+		//elgg_register_menu_item(elgg_echo('event_calendar:review_requests_title'), $CONFIG->wwwroot . "pg/event_calendar/review_requests/".$event_id, '0eventcalendaradmin');
 	}
 	$event_calendar_add_users = elgg_get_plugin_setting('add_users', 'event_calendar');
 	if ($event_calendar_add_users == 'yes') {
diff --git a/start.php b/start.php
index 27b6f9802..954c3400a 100644
--- a/start.php
+++ b/start.php
@@ -358,9 +358,9 @@ function event_calendar_entity_menu_setup($hook, $type, $return, $params) {
 	
 	/*if (elgg_is_admin_logged_in() && (elgg_get_plugin_setting('allow_featured', 'event_calendar') == 'yes')) {
 		if ($event->featured) {
-			add_submenu_item(elgg_echo('event_calendar:unfeature'), $CONFIG->url . "action/event_calendar/unfeature?event_id=".$event_id.'&'.event_calendar_security_fields(), 'eventcalendaractions');
+			elgg_register_menu_item(elgg_echo('event_calendar:unfeature'), $CONFIG->url . "action/event_calendar/unfeature?event_id=".$event_id.'&'.event_calendar_security_fields(), 'eventcalendaractions');
 		} else {
-			add_submenu_item(elgg_echo('event_calendar:feature'), $CONFIG->url . "action/event_calendar/feature?event_id=".$event_id.'&'.event_calendar_security_fields(), 'eventcalendaractions');
+			elgg_register_menu_item(elgg_echo('event_calendar:feature'), $CONFIG->url . "action/event_calendar/feature?event_id=".$event_id.'&'.event_calendar_security_fields(), 'eventcalendaractions');
 		}
 	}*/
 
diff --git a/views/default/event_calendar/entities/gallery_item.php b/views/default/event_calendar/entities/gallery_item.php
index eb67cc772..9fc1edeca 100644
--- a/views/default/event_calendar/entities/gallery_item.php
+++ b/views/default/event_calendar/entities/gallery_item.php
@@ -22,9 +22,9 @@ $icon = elgg_view(
 $banned = $vars['entity']->isBanned();
 
 $rel = "";
-if (page_owner() == $vars['entity']->guid)
+if (elgg_get_page_owner_guid() == $vars['entity']->guid)
 	$rel = 'me';
-else if (check_entity_relationship(page_owner(), 'friend', $vars['entity']->guid))
+else if (check_entity_relationship(elgg_get_page_owner_guid(), 'friend', $vars['entity']->guid))
 	$rel = 'friend';
 
 if (!$banned)
@@ -41,7 +41,7 @@ if ($event_id) {
 	} else {
 		// load the event from the database
 		$event = get_entity($event_id);
-		$user_id = get_loggedin_userid();
+		$user_id = elgg_get_logged_in_user_guid();
 		if ($event && ($event->owner_guid == $user_id)) {
 			$authorised = TRUE;
 		}		
@@ -57,7 +57,7 @@ if ($authorised) {
 	$info .= $link;	
 }
 
-// echo elgg_view_listing($icon, $info);
+// echo elgg_view_image_block($icon, $info);
 echo elgg_view('search/gallery_listing',array('icon' => $icon, 'info' => $info));
 			
 ?>
\ No newline at end of file
diff --git a/views/default/event_calendar/groupprofile_calendar_deprecated.php b/views/default/event_calendar/groupprofile_calendar_deprecated.php
index 081a0eb2d..0d7d5101f 100644
--- a/views/default/event_calendar/groupprofile_calendar_deprecated.php
+++ b/views/default/event_calendar/groupprofile_calendar_deprecated.php
@@ -30,7 +30,7 @@ if (event_calendar_activated_for_group($page_owner_entity)) {
 		foreach($events as $event) {
 			echo elgg_view("object/event_calendar",array('entity' => $event));
 		}
-		echo '<div class="forum_latest"><a href="'.$vars['url'].'pg/event_calendar/group/'.page_owner().'">'.elgg_echo('event_calendar:view_calendar').'</a></div>';
+		echo '<div class="forum_latest"><a href="'.$vars['url'].'pg/event_calendar/group/'.elgg_get_page_owner_guid().'">'.elgg_echo('event_calendar:view_calendar').'</a></div>';
 		echo "</div>";
 			
     } else if (elgg_get_plugin_setting('group_always_display', 'event_calendar') == 'yes') {
diff --git a/views/default/event_calendar/nav.php b/views/default/event_calendar/nav.php
index ceedfd485..746a46151 100644
--- a/views/default/event_calendar/nav.php
+++ b/views/default/event_calendar/nav.php
@@ -17,7 +17,7 @@ $url_start = $vars['url'].'mod/event_calendar/show_events.php?group_guid='.$vars
 <div id="elgg_horizontal_tabbed_nav">
 	<ul>
 <?php
-$event_calendar_spots_display = get_plugin_setting('spots_display', 'event_calendar');
+$event_calendar_spots_display = elgg_get_plugin_setting('spots_display', 'event_calendar');
 if ($event_calendar_spots_display == "yes") {
 ?>
 		<li <?php echo $openselect; ?> ><a onclick="javascript:$('#event_list').load('<?php echo $url_start; ?>&amp;filter=open&amp;callback=true'); return false;" href="<?php echo $url_start; ?>&amp;filter=open&amp;callback=true"><?php echo elgg_echo('event_calendar:open'); ?></a></li>
@@ -30,7 +30,7 @@ if ($event_calendar_spots_display == "yes") {
 	</ul>
 </div>
 <?php
-$event_calendar_region_display = get_plugin_setting('region_display', 'event_calendar');
+$event_calendar_region_display = elgg_get_plugin_setting('region_display', 'event_calendar');
 if ($event_calendar_region_display == 'yes') {
 	$url_start .= '&amp;filter='.$vars['filter'];
 	echo elgg_view('event_calendar/region_select',array('url_start'=>$url_start,'region'=>$vars['region']));
diff --git a/views/default/plugins/event_calendar/settings.php b/views/default/plugins/event_calendar/settings.php
index db6e00913..a58647828 100644
--- a/views/default/plugins/event_calendar/settings.php
+++ b/views/default/plugins/event_calendar/settings.php
@@ -169,7 +169,7 @@ $body .= '<br />';
 
 // agenda view is now handled in the listing area
 
-/*$event_calendar_agenda_view = get_plugin_setting('agenda_view', 'event_calendar');
+/*$event_calendar_agenda_view = elgg_get_plugin_setting('agenda_view', 'event_calendar');
 if (!$event_calendar_agenda_view) {
 	$event_calendar_agenda_view = 'no';
 }