Removed all calls to deprecated register_entity_type

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

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index f74be3446d1bfe94977ab7633db0e4c013a7b0ab..45d4603832abb44a2595bb976f3c87e53cb85464 100644 (file)
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1909,7 +1909,7 @@ function elgg_register_entity_type($type, $subtype = null) {
  * @param string $subtype The subtype to register (may be blank)
  *
  * @return true|false Depending on success
- * @see register_entity_type()
+ * @see elgg_register_entity_type()
  */
 function unregister_entity_type($type, $subtype) {
        global $CONFIG;
@@ -1947,7 +1947,7 @@ function unregister_entity_type($type, $subtype) {
  * @param string $type The type of entity (object, site, user, group) or blank for all
  *
  * @return array|false Depending on whether entities have been registered
- * @see register_entity_type()
+ * @see elgg_register_entity_type()
  */
 function get_registered_entity_types($type = null) {
        global $CONFIG;
@@ -1970,7 +1970,7 @@ function get_registered_entity_types($type = null) {
 }
 
 /**
- * Returns if the entity type and subtype have been registered with {@see register_entity_type()}.
+ * Returns if the entity type and subtype have been registered with {@see elgg_register_entity_type()}.
  *
  * @param string $type    The type of entity (object, site, user, group)
  * @param string $subtype The subtype (may be blank)

diff --git a/engine/lib/users.php b/engine/lib/users.php
index ce325f21e1d8f689069def68b0ba6c3eccf8c6f3..148a22a969d9a96083e0a1caa6479533fc044091 100644 (file)
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1549,7 +1549,7 @@ function users_init() {
        elgg_extend_view('forms/account/settings', 'core/settings/account/default_access', 100);
 
        // Register the user type
-       register_entity_type('user', '');
+       elgg_register_entity_type('user', '');
 
        elgg_register_event_handler('create', 'user', 'user_create_hook_add_site_relationship');
 }

diff --git a/mod/blog/start.php b/mod/blog/start.php
index ae939fef3244773ec3200d980498d316842f85ec..92ce44961bb9f2557755e08e7169c364d4d07dd0 100644 (file)
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -49,7 +49,7 @@ function blog_init() {
        //elgg_register_plugin_hook_handler('pingback:object:subtypes', 'object', 'blog_pingback_subtypes');
 
        // Register for search.
-       register_entity_type('object', 'blog');
+       elgg_register_entity_type('object', 'blog');
 
        // Add group option
        add_group_tool_option('blog', elgg_echo('blog:enableblog'), true);

diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 9d8e5933442fc25632e9bb41922358c2c7924dd5..4f3d7ad1cc005330ae41f0e56fb1915836dd6d97 100644 (file)
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -33,7 +33,7 @@ function bookmarks_init() {
        elgg_register_widget_type('bookmarks',elgg_echo("bookmarks"),elgg_echo("bookmarks:widget:description"));
 
        // Register entity type
-       register_entity_type('object','bookmarks');
+       elgg_register_entity_type('object','bookmarks');
 
        // Add group menu option
        add_group_tool_option('bookmarks',elgg_echo('bookmarks:enablebookmarks'),true);

diff --git a/mod/file/start.php b/mod/file/start.php
index f187cb778e64e18f3e1ff305f7082ee4d21ed09c..0421737b7c1b8030a657cb58720b5cf60020ed42 100644 (file)
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -45,7 +45,7 @@ function file_init() {
        add_group_tool_option('file', elgg_echo('groups:enablefiles'), true);
 
        // Register entity type for search
-       register_entity_type('object', 'file');
+       elgg_register_entity_type('object', 'file');
 
        // add a file link to owner blocks
        elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'file_owner_block_menu');

diff --git a/mod/groups/start.php b/mod/groups/start.php
index 9b18e4d9b789f412421885aec91d7ea78e2de156..6cd4b07adbf55e44ca81445a3a74f0ce22e68079 100644 (file)
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -18,7 +18,7 @@ function groups_init() {
        elgg_register_library('elgg:groups', elgg_get_plugins_path() . 'groups/lib/groups.php');
 
        // register group entities for search
-       register_entity_type('group', '');
+       elgg_register_entity_type('group', '');
 
        // Set up the menu
        $item = new ElggMenuItem('groups', elgg_echo('groups'), 'pg/groups/all');

diff --git a/mod/pages/start.php b/mod/pages/start.php
index 51f7f84af6e5bac8b37a73e032b780ffd69b2e72..ea37ba935b88c898d2cbe2f5ccb1f8b1923773c3 100644 (file)
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -37,8 +37,8 @@ function pages_init() {
        elgg_extend_view('css/screen', 'pages/css');
 
        // Register entity type for search
-       register_entity_type('object', 'page');
-       register_entity_type('object', 'page_top');
+       elgg_register_entity_type('object', 'page');
+       elgg_register_entity_type('object', 'page_top');
 
        // Register granular notification for this type
        register_notification_object('object', 'page', elgg_echo('pages:new'));

diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index d36be6e992ab23f1125f85b831266a101acbf4a9..0c0d1efad7787feed7741cfa07291c18b345c63a 100644 (file)
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -38,7 +38,7 @@ function thewire_init() {
        add_widget_type('thewire', elgg_echo('thewire'), elgg_echo("thewire:widget:desc"));\r
 \r
        // Register entity type\r
-       register_entity_type('object', 'thewire');\r
+       elgg_register_entity_type('object', 'thewire');\r
 \r
        // Register granular notification for this type\r
        register_notification_object('object', 'thewire', elgg_echo('thewire:notify:subject'));\r