[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10384-gddc99a3

[Marc Delisle]

The branch, master has been updated
       via  ddc99a3deeab80db72cf52f88ddbe685b68e52d1 (commit)
      from  c699e8800e5d782c490b289d6c662e5a5d16ace2 (commit)


- Log -----------------------------------------------------------------
commit ddc99a3deeab80db72cf52f88ddbe685b68e52d1
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Sep 26 07:39:37 2010 -0400

    renaming mysql db does not make sense

-----------------------------------------------------------------------

Summary of changes:
 db_operations.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/db_operations.php b/db_operations.php
index c17d372..2f89351 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -343,6 +343,7 @@ if (!$is_information_schema) {
     /**
      * rename database
      */
+if ($db != 'mysql') {
     ?>
     <form id="rename_db_form" method="post" action="db_operations.php"
         onsubmit="return emptyFormElements(this, 'newname')">
@@ -383,9 +384,11 @@ if (!$is_information_schema) {
     </fieldset>
     </form>
 <?php
+} // end if
+
 // Drop link if allowed
 // Don't even try to drop information_schema. You won't be able to. Believe me. You won't.
-// Don't allow to easilly drop mysql database, RFE #1327514.
+// Don't allow to easily drop mysql database, RFE #1327514.
 if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) && ! $db_is_information_schema && ($db != 'mysql')) {
 ?>
 <fieldset class="caution">


hooks/post-receive
-- 
phpMyAdmin