Updated register_entity_url_handler => elgg_* in plugins. Used this regex: ([^_a...

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

diff --git a/mod/blog/start.php b/mod/blog/start.php
index 92ce44961bb9f2557755e08e7169c364d4d07dd0..04197aa4eaa43259d30a806856730c959ff61057 100644 (file)
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -35,7 +35,7 @@ function blog_init() {
        elgg_register_page_handler('blog', 'blog_page_handler');
 
        // override the default url to view a blog object
-       register_entity_url_handler('blog_url_handler', 'object', 'blog');
+       elgg_register_entity_url_handler('object', 'blog', 'blog_url_handler');
 
        // notifications
        register_notification_object('object', 'blog', elgg_echo('blog:newpost'));

diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 4f3d7ad1cc005330ae41f0e56fb1915836dd6d97..98449d0d1bd6c631aed480645e867768ee12bddb 100644 (file)
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -27,7 +27,7 @@ function bookmarks_init() {
        elgg_register_plugin_hook_handler('notify:entity:message', 'object', 'bookmarks_notify_message');
 
        // Register a URL handler for shared items
-       register_entity_url_handler('bookmark_url','object','bookmarks');
+       elgg_register_entity_url_handler('object','bookmarks', 'bookmark_url');
 
        // Shares widget
        elgg_register_widget_type('bookmarks',elgg_echo("bookmarks"),elgg_echo("bookmarks:widget:description"));

diff --git a/mod/file/start.php b/mod/file/start.php
index 0421737b7c1b8030a657cb58720b5cf60020ed42..d77c082cc1aa03fe1ace56722e0fa563fb8c6eae 100644 (file)
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -32,7 +32,7 @@ function file_init() {
        elgg_register_widget_type('filerepo', elgg_echo("file"), elgg_echo("file:widget:description"));
 
        // Register URL handlers for files
-       register_entity_url_handler('file_url_override', 'object', 'file');
+       elgg_register_entity_url_handler('object', 'file', 'file_url_override');
        elgg_register_plugin_hook_handler('entity:icon:url', 'object', 'file_icon_url_override');
 
        // Register granular notification for this object type

diff --git a/mod/groups/start.php b/mod/groups/start.php
index 6cd4b07adbf55e44ca81445a3a74f0ce22e68079..96eca34d434f5dd38467c79ddb4dd388e8360614 100644 (file)
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -28,7 +28,7 @@ function groups_init() {
        elgg_register_page_handler('groups', 'groups_page_handler');
 
        // Register URL handlers for groups
-       register_entity_url_handler('groups_url', 'group', 'all');
+       elgg_register_entity_url_handler('group', 'all', 'groups_url');
        elgg_register_plugin_hook_handler('entity:icon:url', 'group', 'groups_icon_url_override');
 
        // Register an icon handler for groups
@@ -477,7 +477,7 @@ function discussion_init() {
 
        elgg_register_page_handler('discussion', 'discussion_page_handler');
 
-       register_entity_url_handler('discussion_override_topic_url', 'object', 'groupforumtopic');
+       elgg_register_entity_url_handler('object', 'groupforumtopic', 'discussion_override_topic_url');
        //register_extender_url_handler('group_topicpost_url', 'annotation', 'group_topic_post');
 
        $action_base = elgg_get_plugins_path() . 'groups/actions/discussion';

diff --git a/mod/messages/start.php b/mod/messages/start.php
index 491bdab15d0a9bf5fb4731b5ce25091586fd0f79..da85a09ef1f0a8df4231b4e88ad78e8456cc4ec5 100644 (file)
--- a/mod/messages/start.php
+++ b/mod/messages/start.php
@@ -40,7 +40,7 @@ function messages_init() {
        elgg_register_page_handler('messages', 'messages_page_handler');
 
        // Register a URL handler
-       register_entity_url_handler('messages_url', 'object', 'messages');
+       elgg_register_entity_url_handler('object', 'messages', 'messages_url');
 
        // Extend avatar hover menu
        elgg_register_plugin_hook_handler('register', 'menu:user_hover', 'messages_user_hover_menu');

diff --git a/mod/pages/start.php b/mod/pages/start.php
index ea37ba935b88c898d2cbe2f5ccb1f8b1923773c3..ec5a8815bff7b90eec93e7796f7c6ab87f48c424 100644 (file)
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -23,8 +23,8 @@ function pages_init() {
        elgg_register_page_handler('pages', 'pages_page_handler');
 
        // Register a url handler
-       register_entity_url_handler('pages_url', 'object', 'page_top');
-       register_entity_url_handler('pages_url', 'object', 'page');
+       elgg_register_entity_url_handler('object', 'page_top', 'pages_url');
+       elgg_register_entity_url_handler('object', 'page', 'pages_url');
        register_extender_url_handler('pages_revision_url', 'annotation', 'page');
 
        // Register some actions

diff --git a/mod/profile/start.php b/mod/profile/start.php
index 05db3ce861a0d0fbba63ee1ed53409e1d287d5a1..67be35e7e352895d0266194767ccefdc3a6bc5cd 100644 (file)
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -14,7 +14,7 @@ function profile_init() {
 
        // Register a URL handler for users - this means that profile_url()
        // will dictate the URL for all ElggUser objects
-       register_entity_url_handler('profile_url', 'user', 'all');
+       elgg_register_entity_url_handler('user', 'all', 'profile_url');
 
        // Metadata on users needs to be independent
        register_metadata_as_independent('user');

diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 0c0d1efad7787feed7741cfa07291c18b345c63a..7450ea78ad34889ae81736ea7c243133ef099d9b 100644 (file)
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -32,7 +32,7 @@ function thewire_init() {
        elgg_register_page_handler('thewire', 'thewire_page_handler');\r
 \r
        // Register a URL handler for thewire posts\r
-       register_entity_url_handler('thewire_url', 'object', 'thewire');\r
+       elgg_register_entity_url_handler('object', 'thewire', 'thewire_url');\r
 \r
        // Your thewire widget\r
        add_widget_type('thewire', elgg_echo('thewire'), elgg_echo("thewire:widget:desc"));\r