Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 12 insertions, 4 deletions

diff --git a/mod/diagnostics/views/default/admin/utilities/diagnostics.php b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
index 76f12b0ae..89e235279 100644
--- a/mod/diagnostics/views/default/admin/utilities/diagnostics.php
+++ b/mod/diagnostics/views/default/admin/develop_utilities/diagnostics.php
@@ -4,8 +4,15 @@
  */
 
 $diagnostics_title = elgg_echo('diagnostics:report');
-$diagnostics = elgg_echo('diagnostics:description');
-$diagnostics .= elgg_view_form('diagnostics/download');
+$diagnostics = '<p>' . elgg_echo('diagnostics:description') .'</p>';
+$params = array(
+	'text' => elgg_echo('diagnostics:download'),
+	'href' => 'action/diagnostics/download',
+	'class' => 'elgg-button elgg-button-submit',
+	'is_action' => true,
+	'is_trusted' => true,
+);
+$diagnostics .= '<p>' . elgg_view('output/url', $params) . '</p>';
 
 // unit tests
 $unit_tests_title = elgg_echo('diagnostics:unittester');
@@ -18,6 +25,7 @@ if (elgg_get_config('debug')) {
 		'text' => elgg_echo('diagnostics:test:executeall'),
 		'href' => 'engine/tests/suite.php',
 		'class' => 'elgg-button elgg-button-submit',
+		'is_trusted' => true,
 	);
 	$unit_tests .= '<p>' . elgg_view('output/url', $params) . '</p>';
 } else {
@@ -26,5 +34,5 @@ if (elgg_get_config('debug')) {
 }
 
 // display admin body
-echo elgg_view_module('inline', $diagnostics_title, $diagnostics);
-echo elgg_view_module('inline', $unit_tests_title, $unit_tests);
+echo elgg_view_module('inline', $diagnostics_title, $diagnostics, array('class' => 'elgg-form-settings'));
+echo elgg_view_module('inline', $unit_tests_title, $unit_tests, array('class' => 'elgg-form-settings'));