From c694ea42b4363ab2f37a8a90177800b3e5b28e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sun, 16 Oct 2005 15:31:03 +0000 Subject: [PATCH] Don't allow to check mysql database for dropping (RFE #1327514). --- ChangeLog | 2 ++ server_databases.php | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a09317496..233086414 100755 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ $Source$ 2005-10-16 Michal Čihař * db_details_links.php: Disable drop tab on mysql database (RFE #1327514). + * server_databases.php: Don't allow to check mysql database for dropping + (RFE #1327514). 2005-10-16 Marc Delisle * tbl_create.php: undefined $field_collation under MySQL < 4.1.x diff --git a/server_databases.php b/server_databases.php index 1e338417c..4055affc2 100644 --- a/server_databases.php +++ b/server_databases.php @@ -222,8 +222,10 @@ if (count($statistics) > 0) { echo ' ' . "\n"; if ($is_superuser || $cfg['AllowUserDropDatabase']) { echo ' ' . "\n"; - if (PMA_MYSQL_INT_VERSION < 50002 || $current['db_name'] != 'information_schema') { + if ($current['db_name'] != 'mysql' && (PMA_MYSQL_INT_VERSION < 50002 || $current['db_name'] != 'information_schema')) { echo ' ' . "\n"; + } else { + echo ' ' . "\n"; } echo ' ' . "\n"; }