Fixes #3014 using more standard "register" in admin convenience function

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

diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index b4a55877c082f6a9ef3d3943721aea5094c3282f..e14dc782621af78cb8ab560162abcc7106496aef 100644 (file)
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -124,11 +124,11 @@ function elgg_admin_notice_exists($id) {
  * @return bool
  * @since 1.8.0
  */
-function elgg_add_admin_menu_item($menu_id, $parent_id = NULL, $weight = 100) {
+function elgg_register_admin_menu_item($menu_id, $parent_id = NULL, $weight = 100) {
 
        // make sure parent is registered
        if ($parent_id && !elgg_is_menu_item_registered('page', $parent_id)) {
-               elgg_add_admin_menu_item($parent_id);
+               elgg_register_admin_menu_item($parent_id);
        }
 
        // in the admin section parents never have links
@@ -182,29 +182,29 @@ function admin_init() {
        elgg_register_simplecache_view('js/admin');
 
        // statistics
-       elgg_add_admin_menu_item('statistics', null, 60);
-       elgg_add_admin_menu_item('overview', 'statistics');
+       elgg_register_admin_menu_item('statistics', null, 60);
+       elgg_register_admin_menu_item('overview', 'statistics');
 
        // site
-       elgg_add_admin_menu_item('site', null, 20);
-       elgg_add_admin_menu_item('basic', 'site', 10);
-       elgg_add_admin_menu_item('advanced', 'site', 20);
+       elgg_register_admin_menu_item('site', null, 20);
+       elgg_register_admin_menu_item('basic', 'site', 10);
+       elgg_register_admin_menu_item('advanced', 'site', 20);
 
        // appearance
-       elgg_add_admin_menu_item('appearance', null, 30);
-       elgg_add_admin_menu_item('menu_items', 'appearance', 10);
-       elgg_add_admin_menu_item('profile_fields', 'appearance', 20);
+       elgg_register_admin_menu_item('appearance', null, 30);
+       elgg_register_admin_menu_item('menu_items', 'appearance', 10);
+       elgg_register_admin_menu_item('profile_fields', 'appearance', 20);
 
        // users
-       elgg_add_admin_menu_item('users', null, 40);
-       elgg_add_admin_menu_item('add', 'users', 10);
-       elgg_add_admin_menu_item('online', 'users', 20);
-       elgg_add_admin_menu_item('newest', 'users', 30);
+       elgg_register_admin_menu_item('users', null, 40);
+       elgg_register_admin_menu_item('add', 'users', 10);
+       elgg_register_admin_menu_item('online', 'users', 20);
+       elgg_register_admin_menu_item('newest', 'users', 30);
 
        // plugins
-       elgg_add_admin_menu_item('plugins', null, 50);
-       elgg_add_admin_menu_item('simple', 'plugins', 10);
-       elgg_add_admin_menu_item('advanced', 'plugins', 20);
+       elgg_register_admin_menu_item('plugins', null, 50);
+       elgg_register_admin_menu_item('simple', 'plugins', 10);
+       elgg_register_admin_menu_item('advanced', 'plugins', 20);
 
        // dashboard
        elgg_register_menu_item('page', array(
@@ -255,7 +255,7 @@ function elgg_admin_add_plugin_settings_menu() {
                return FALSE;
        }
 
-       elgg_add_admin_menu_item('plugin_settings', null, 51);
+       elgg_register_admin_menu_item('plugin_settings', null, 51);
 
        foreach ($active_plugins as $plugin) {
                $plugin_id = $plugin->getID();

diff --git a/engine/lib/widgets.php b/engine/lib/widgets.php
index cd8b657f317f159a91830d6565d36bf380523825..53b4a33094a59ca9ca96086b39f69faff5b8dec9 100644 (file)
--- a/engine/lib/widgets.php
+++ b/engine/lib/widgets.php
@@ -288,7 +288,7 @@ function elgg_default_widgets_init() {
        $CONFIG->default_widget_info = $default_widgets;
 
        if ($default_widgets) {
-               elgg_add_admin_menu_item('default_widgets', 'appearance', 30);
+               elgg_register_admin_menu_item('default_widgets', 'appearance', 30);
 
                // override permissions for creating widget on logged out / just created entities
                elgg_register_plugin_hook_handler('container_permissions_check', 'object', 'elgg_default_widgets_permissions_override');

diff --git a/mod/developers/start.php b/mod/developers/start.php
index 5dc4cb2b80f0fb9fdfc1e1b0949450fa7070307a..8f437e3172af0c013a8edee3751cfae6e4eb15f5 100644 (file)
--- a/mod/developers/start.php
+++ b/mod/developers/start.php
@@ -18,9 +18,9 @@ function developers_init() {
 
 function developers_setup_menu() {
        if (elgg_in_context('admin')) {
-               elgg_add_admin_menu_item('developers');
-               elgg_add_admin_menu_item('settings', 'developers');
-               elgg_add_admin_menu_item('preview', 'developers');
+               elgg_register_admin_menu_item('developers');
+               elgg_register_admin_menu_item('settings', 'developers');
+               elgg_register_admin_menu_item('preview', 'developers');
        }
 }
 

diff --git a/mod/diagnostics/start.php b/mod/diagnostics/start.php
index 21ee6207d8bd774123601bfb67594fdfde3ce474..74c53e2f6d8406239fd7f00b8fb1b4f673ac8d87 100644 (file)
--- a/mod/diagnostics/start.php
+++ b/mod/diagnostics/start.php
@@ -16,7 +16,7 @@ function diagnostics_init() {
        elgg_register_page_handler('diagnostics','diagnostics_page_handler');
 
        // Add admin menu item
-       elgg_add_admin_menu_item('diagnostics', 'utilities');
+       elgg_register_admin_menu_item('diagnostics', 'utilities');
 
        // Register some actions
        $file = elgg_get_plugins_path() . "diagnostics/actions/download.php";

diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php
index 16f46326f83e82fa163be3143e3b5dae36448067..cdc40027434c6441ba7300e7fb16ecc35d146ba8 100644 (file)
--- a/mod/externalpages/start.php
+++ b/mod/externalpages/start.php
@@ -11,7 +11,7 @@ function expages_init() {
        elgg_register_page_handler('expages', 'expages_page_handler');
 
        // add a menu item for the admin edit page
-       elgg_add_admin_menu_item('expages', 'site');
+       elgg_register_admin_menu_item('expages', 'site');
 
        // add footer links
        expages_setup_footer_menu();

diff --git a/mod/logbrowser/start.php b/mod/logbrowser/start.php
index f0f4070db5e3fa6665c6224f2432385d7f5f0e98..2bbd08980e7e38648843daf459b9ce3b66f7b1aa 100644 (file)
--- a/mod/logbrowser/start.php
+++ b/mod/logbrowser/start.php
@@ -14,7 +14,7 @@ function logbrowser_init() {
        
        elgg_register_plugin_hook_handler('register', 'menu:user_hover', 'logbrowser_user_hover_menu');
        
-       elgg_add_admin_menu_item('logbrowser', 'utilities');
+       elgg_register_admin_menu_item('logbrowser', 'utilities');
 }
 
 /**

diff --git a/mod/reportedcontent/start.php b/mod/reportedcontent/start.php
index fe717395806b6ae2bc014b492edbf5f3377d2d55..bd5931bd1deef0348cb96a15bbade54e85c29853 100644 (file)
--- a/mod/reportedcontent/start.php
+++ b/mod/reportedcontent/start.php
@@ -38,7 +38,7 @@ function reportedcontent_init() {
        elgg_register_plugin_hook_handler('register', 'menu:user_hover', 'reportedcontent_user_hover_menu');
 
        // Add admin menu item
-       elgg_add_admin_menu_item('reportedcontent', 'utilities');
+       elgg_register_admin_menu_item('reportedcontent', 'utilities');
 
        elgg_register_widget_type(
                        'reportedcontent',

diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php
index ce9a9cd2cda27fc9e864921c531d115141b05b7e..91bb454cf5af994417eedb03299487d0d6298888 100644 (file)
--- a/mod/uservalidationbyemail/start.php
+++ b/mod/uservalidationbyemail/start.php
@@ -39,7 +39,7 @@ function uservalidationbyemail_init() {
        elgg_register_plugin_hook_handler('public_pages', 'walled_garden', 'uservalidationbyemail_public_pages');
 
        // admin interface to manually validate users
-       elgg_add_admin_menu_item('unvalidated', 'users');
+       elgg_register_admin_menu_item('unvalidated', 'users');
 
        elgg_extend_view('js/elgg', 'uservalidationbyemail/js');