Fixes #3681 fixed Utilities menu collisions in admin section and added documentation...

diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index cefe40ecf5e3d5cd13a946373c41d8b072567938..0e9ec1c1798b398bb466367ea974b00c3632d27c 100644 (file)
--- a/engine/lib/navigation.php
+++ b/engine/lib/navigation.php
@@ -53,6 +53,9 @@
  * 'register', 'menu:<menu_name>'. If you do, you may end up with many incorrect
  * links on a context-sensitive menu.
  *
+ * @warning A menu item's name must be unique per menu. If more than one menu
+ * item with the same name are registered, the last menu item takes priority.
+ *
  * @see elgg_view_menu() for the plugin hooks available for modifying a menu as
  * it is being rendered.
  *

diff --git a/languages/en.php b/languages/en.php
index 6e07b256b76c597f0fc6bebf81710fe3dd02389c..3a922b889475f172e96a772487969adc0b31f978 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -544,7 +544,8 @@ $english = array(
        'admin:statistics:overview' => 'Overview',
 
        'admin:appearance' => 'Appearance',
-       'admin:utilities' => 'Utilities',
+       'admin:administer_utilities' => 'Utilities',
+       'admin:develop_utilities' => 'Utilities',
 
        'admin:users' => "Users",
        'admin:users:online' => 'Currently Online',

diff --git a/mod/diagnostics/languages/en.php b/mod/diagnostics/languages/en.php
index 6d71945e365302b4ba605909287d0f10b1ae75c4..c4e337b50e2b9fde4d44b672c0c14c7f704c2392 100644 (file)
--- a/mod/diagnostics/languages/en.php
+++ b/mod/diagnostics/languages/en.php
@@ -7,7 +7,7 @@
 
        $english = array(
 
-                       'admin:utilities:diagnostics' => 'System Diagnostics',
+                       'admin:develop_utilities:diagnostics' => 'System Diagnostics',
                        'diagnostics' => 'System diagnostics',
                        'diagnostics:report' => 'Diagnostics Report',
                        'diagnostics:unittester' => 'Unit Tests',

diff --git a/mod/diagnostics/start.php b/mod/diagnostics/start.php
index c55b1048308fe824b24254cf4267d9f49a510425..735e15042892b42457f5033b07b268c51ffc20f0 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_register_admin_menu_item('develop', 'diagnostics', 'utilities');
+       elgg_register_admin_menu_item('develop', 'diagnostics', 'develop_utilities');
 
        // Register some actions
        $file = elgg_get_plugins_path() . "diagnostics/actions/download.php";

diff --git a/mod/diagnostics/views/default/admin/utilities/diagnostics.php b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
similarity index 100%
rename from mod/diagnostics/views/default/admin/utilities/diagnostics.php
rename to mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php

diff --git a/mod/logbrowser/languages/en.php b/mod/logbrowser/languages/en.php
index 90689a1b06a87b6626ecdae50d8bf7eec7c8b952..3b6ead27207a7172f6aeeabc548f646337d98c42 100644 (file)
--- a/mod/logbrowser/languages/en.php
+++ b/mod/logbrowser/languages/en.php
@@ -6,7 +6,7 @@
  */
 
 $english = array(
-       'admin:utilities:logbrowser' => 'Log browser',
+       'admin:administer_utilities:logbrowser' => 'Log browser',
        'logbrowser' => 'Log browser',
        'logbrowser:browse' => 'Browse system log',
        'logbrowser:search' => 'Refine results',

diff --git a/mod/logbrowser/start.php b/mod/logbrowser/start.php
index 71b6115a565e098709f635b0ada45722bd3411a8..3bffe800a9bf61796aa7ef5f5ffdc7b360949736 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_register_admin_menu_item('administer', 'logbrowser', 'utilities');
+       elgg_register_admin_menu_item('administer', 'logbrowser', 'administer_utilities');
 }
 
 /**

diff --git a/mod/logbrowser/views/default/admin/utilities/logbrowser.php b/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
similarity index 100%
rename from mod/logbrowser/views/default/admin/utilities/logbrowser.php
rename to mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php

diff --git a/mod/reportedcontent/languages/en.php b/mod/reportedcontent/languages/en.php
index c047644e3fd1ec019eaa250d5972c47ac1b305ad..c2e197879ac8b50eff16c9a614387715bdbba3b9 100644 (file)
--- a/mod/reportedcontent/languages/en.php
+++ b/mod/reportedcontent/languages/en.php
@@ -8,7 +8,7 @@
 $english = array(
 
        'item:object:reported_content' => 'Reported items',
-       'admin:utilities:reportedcontent' => 'Reported content',
+       'admin:administer_utilities:reportedcontent' => 'Reported content',
        'reportedcontent' => 'Reported content',
        'reportedcontent:this' => 'Report this',
        'reportedcontent:this:tooltip' => 'Report this page to an administrator',

diff --git a/mod/reportedcontent/start.php b/mod/reportedcontent/start.php
index 87b4b3c7b41a91a2478f9ca2ecfaf7ff72a0f55e..66a1248d92e638cb51499a2173edde2637f9420f 100644 (file)
--- a/mod/reportedcontent/start.php
+++ b/mod/reportedcontent/start.php
@@ -39,7 +39,7 @@ function reportedcontent_init() {
 
        // Add admin menu item
        // @todo Might want to move this to a 'feedback' section. something other than utils
-       elgg_register_admin_menu_item('administer', 'reportedcontent', 'utilities');
+       elgg_register_admin_menu_item('administer', 'reportedcontent', 'administer_utilities');
 
        elgg_register_widget_type(
                        'reportedcontent',

diff --git a/mod/reportedcontent/views/default/admin/utilities/reportedcontent.php b/mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php
similarity index 100%
rename from mod/reportedcontent/views/default/admin/utilities/reportedcontent.php
rename to mod/reportedcontent/views/default/admin/administer_utilities/reportedcontent.php