fix for mysqladmin links; merged from MOODLE_16_STABLE

diff --git a/admin/index.php b/admin/index.php
index e90bf180eeae466bd6de065914cae7f7e542afbe..01a7f01c9c096dc0b0d228f544445585eab25ffc 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -423,14 +423,15 @@
                  '</a> - <span class="explanation">'.get_string('adminhelpstickyblocks').'</span></div>';
     $miscdata .= '<div class="adminlink"><a href="report.php">'.get_string('reports').
                  '</a> - <span class="explanation">'.get_string('adminhelpreports').'</span></div>';
-    $miscdata .= '<div class="adminlink"><a href="health.php">'.get_string('healthcenter').
-                 '</a> - <span class="explanation">'.get_string('adminhelphealthcenter').'</span></div>';
+//to be enabled later
+/*    $miscdata .= '<div class="adminlink"><a href="health.php">'.get_string('healthcenter').
+                 '</a> - <span class="explanation">'.get_string('adminhelphealthcenter').'</span></div>';*/
     $miscdata .= '<div class="adminlink"><a href="environment.php">'.get_string('environment', 'admin').
                  '</a> - <span class="explanation">'.get_string('adminhelpenvironment').'</span></div>';
 /// Optional stuff
     if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
-        $table->data[] = array("<strong><a href=\"$CFG->dbtype/frame.php\">".get_string('managedatabase').'</a></strong>',
-                               '<div class="explanation">'.get_string('adminhelpmanagedatabase').'</div>');
+        $miscdata .= '<div class="adminlink"><a href="'.$CFG->dbtype.'/frame.php">'.get_string('managedatabase').
+                                '</a> - <span class="explanation">'.get_string('adminhelpmanagedatabase').'</span></div>';
     }
 
     $table->data[] = array('<strong><a href="misc.php">'.get_string('miscellaneous').'</a></strong>', $miscdata);

diff --git a/admin/misc.php b/admin/misc.php
index c1fccd0d2283fa1280b3e32166b38da880dc8d17..6aa599ddc33007e816517d9a06a44c0a4d876e81 100644 (file)
--- a/admin/misc.php
+++ b/admin/misc.php
@@ -28,10 +28,15 @@
                            get_string('adminhelpstickyblocks'));
     $table->data[] = array('<b><a href="report.php">'.get_string('reports')."</a></b>",
                            get_string('adminhelpreports'));
-    $table->data[] = array('<b><a href="health.php">'.get_string('healthcenter')."</a></b>",
-                           get_string('adminhelphealthcenter'));
+// to be enabled later
+/*    $table->data[] = array('<b><a href="health.php">'.get_string('healthcenter')."</a></b>",
+                           get_string('adminhelphealthcenter'));*/
     $table->data[] = array('<b><a href="environment.php">'.get_string('environment', 'admin')."</a></b>",
                            get_string('adminhelpenvironment'));
+    if (file_exists("$CFG->dirroot/$CFG->admin/$CFG->dbtype")) {
+        $table->data[] = array('<b><a href="'.$CFG->dbtype.'/frame.php">'.get_string('managedatabase')."</a></b>",
+                           get_string('adminhelpmanagedatabase'));
+    }
 
     print_table($table);