From 710b17aa37dd5c90db695219defdfef7a889f29a Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Wed, 14 Sep 2011 21:09:48 -0400
Subject: Fixes #3681 fixed Utilities menu collisions in admin section and
 added documentation about registering more than one menu item with the same
 name to a menu

---
 mod/diagnostics/languages/en.php                   |  2 +-
 mod/diagnostics/start.php                          |  2 +-
 .../admin/develop_utilities/diagnostics.php        | 30 ++++++++++++++++++++++
 .../views/default/admin/utilities/diagnostics.php  | 30 ----------------------
 4 files changed, 32 insertions(+), 32 deletions(-)
 create mode 100644 mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
 delete mode 100644 mod/diagnostics/views/default/admin/utilities/diagnostics.php

(limited to 'mod/diagnostics')

diff --git a/mod/diagnostics/languages/en.php b/mod/diagnostics/languages/en.php
index 6d71945e3..c4e337b50 100644
--- 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 c55b10483..735e15042 100644
--- 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/develop_utilities/diagnostics.php b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
new file mode 100644
index 000000000..76f12b0ae
--- /dev/null
+++ b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Diagnostics admin page
+ */
+
+$diagnostics_title = elgg_echo('diagnostics:report');
+$diagnostics = elgg_echo('diagnostics:description');
+$diagnostics .= elgg_view_form('diagnostics/download');
+
+// unit tests
+$unit_tests_title = elgg_echo('diagnostics:unittester');
+$unit_tests .= '<p>' . elgg_echo('diagnostics:unittester:description') . '</p>';
+$unit_tests .= '<p>' . elgg_echo('diagnostics:unittester:warning') . '</p>';
+
+if (elgg_get_config('debug')) {
+	// create a button to run tests
+	$params = array(
+		'text' => elgg_echo('diagnostics:test:executeall'),
+		'href' => 'engine/tests/suite.php',
+		'class' => 'elgg-button elgg-button-submit',
+	);
+	$unit_tests .= '<p>' . elgg_view('output/url', $params) . '</p>';
+} else {
+	// no tests when not in debug mode
+	$unit_tests .= elgg_echo('diagnostics:unittester:debug');
+}
+
+// display admin body
+echo elgg_view_module('inline', $diagnostics_title, $diagnostics);
+echo elgg_view_module('inline', $unit_tests_title, $unit_tests);
diff --git a/mod/diagnostics/views/default/admin/utilities/diagnostics.php b/mod/diagnostics/views/default/admin/utilities/diagnostics.php
deleted file mode 100644
index 76f12b0ae..000000000
--- a/mod/diagnostics/views/default/admin/utilities/diagnostics.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Diagnostics admin page
- */
-
-$diagnostics_title = elgg_echo('diagnostics:report');
-$diagnostics = elgg_echo('diagnostics:description');
-$diagnostics .= elgg_view_form('diagnostics/download');
-
-// unit tests
-$unit_tests_title = elgg_echo('diagnostics:unittester');
-$unit_tests .= '<p>' . elgg_echo('diagnostics:unittester:description') . '</p>';
-$unit_tests .= '<p>' . elgg_echo('diagnostics:unittester:warning') . '</p>';
-
-if (elgg_get_config('debug')) {
-	// create a button to run tests
-	$params = array(
-		'text' => elgg_echo('diagnostics:test:executeall'),
-		'href' => 'engine/tests/suite.php',
-		'class' => 'elgg-button elgg-button-submit',
-	);
-	$unit_tests .= '<p>' . elgg_view('output/url', $params) . '</p>';
-} else {
-	// no tests when not in debug mode
-	$unit_tests .= elgg_echo('diagnostics:unittester:debug');
-}
-
-// display admin body
-echo elgg_view_module('inline', $diagnostics_title, $diagnostics);
-echo elgg_view_module('inline', $unit_tests_title, $unit_tests);
-- 
cgit v1.2.3