Fixes #2367: With fear and trepidation, converting events/plugin hooks to use elgg_ prefixed versions

git-svn-id: http://code.elgg.org/elgg/trunk@7284 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 9 insertions, 9 deletions

diff --git a/mod/profile/actions/edit.php b/mod/profile/actions/edit.php
index f3c928cef..312b72a1a 100644
--- a/mod/profile/actions/edit.php
+++ b/mod/profile/actions/edit.php
@@ -98,7 +98,7 @@ if (sizeof($input) > 0) {
 	$profile_owner->save();
 
 	// Notify of profile update
-	trigger_elgg_event('profileupdate',$user->type,$user);
+	elgg_trigger_event('profileupdate',$user->type,$user);
 
 	//add to river if edited by self
 	if (get_loggedin_userid() == $user->guid) {
diff --git a/mod/profile/actions/iconupload.php b/mod/profile/actions/iconupload.php
index cd842752f..f146316f0 100644
--- a/mod/profile/actions/iconupload.php
+++ b/mod/profile/actions/iconupload.php
@@ -54,7 +54,7 @@ foreach ($icon_sizes as $name => $size_info) {
 }
 
 $profile_owner->icontime = time();
-if (trigger_elgg_event('profileiconupdate', $profile_owner->type, $profile_owner)) {
+if (elgg_trigger_event('profileiconupdate', $profile_owner->type, $profile_owner)) {
 	// pull this out into the river plugin.
 	//add_to_river('river/user/default/profileiconupdate','update',$user->guid,$user->guid);
 	system_message(elgg_echo("profile:icon:uploaded"));
diff --git a/mod/profile/start.php b/mod/profile/start.php
index dab12b12d..6e9a43a68 100644
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -45,10 +45,10 @@ function profile_init() {
 	elgg_extend_view('js/initialise_elgg', 'profile/javascript');
 
 	// Now override icons
-	register_plugin_hook('entity:icon:url', 'user', 'profile_usericon_hook');
+	elgg_register_plugin_hook_handler('entity:icon:url', 'user', 'profile_usericon_hook');
 
 	// allow ECML in parts of the profile
-	register_plugin_hook('get_views', 'ecml', 'profile_ecml_views_hook');
+	elgg_register_plugin_hook_handler('get_views', 'ecml', 'profile_ecml_views_hook');
 
 	// default profile fields admin item
 	elgg_add_admin_submenu_item('defaultprofile', elgg_echo('profile:edit:default'), 'appearance');
@@ -97,7 +97,7 @@ function profile_fields_setup() {
 		$profile_defaults = $loaded_defaults;
 	}
 
-	$CONFIG->profile = trigger_plugin_hook('profile:fields', 'profile', NULL, $profile_defaults);
+	$CONFIG->profile = elgg_trigger_plugin_hook('profile:fields', 'profile', NULL, $profile_defaults);
 
 	// register any tag metadata names
 	foreach ($CONFIG->profile as $name => $type) {
@@ -275,11 +275,11 @@ function profile_ecml_views_hook($hook, $entity_type, $return_value, $params) {
 }
 
 // Make sure the profile initialisation function is called on initialisation
-register_elgg_event_handler('init','system','profile_init',1);
-register_elgg_event_handler('init','system','profile_fields_setup', 10000); // Ensure this runs after other plugins
+elgg_register_event_handler('init','system','profile_init',1);
+elgg_register_event_handler('init','system','profile_fields_setup', 10000); // Ensure this runs after other plugins
 
-register_elgg_event_handler('pagesetup','system','profile_pagesetup');
-register_elgg_event_handler('profileupdate','all','object_notifications');
+elgg_register_event_handler('pagesetup','system','profile_pagesetup');
+elgg_register_event_handler('profileupdate','all','object_notifications');
 
 
 // Register actions