Hide routine language if not required

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 23286485499d74250399760d528c3d6d86824ca4..b457ef7b3242b0f7ec2087f0fb0d864ed2872939 100644 (file)
--- a/adminer/drivers/mysql.inc.php
+++ b/adminer/drivers/mysql.inc.php
@@ -768,7 +768,7 @@ if (!defined("DRIVER")) {
        * @return array
        */
        function routine_languages() {
-               return array("SQL");
+               return array(); // "SQL" not required
        }
        
        /** Begin transaction

diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index 25a69a142606920020b7f7fd142457ed0a30f705..f2883f5d04281a03f19c709e8ef68dd596ad1837 100644 (file)
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -475,6 +475,10 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
                // not supported by SQLite
        }
        
+       function routine_languages() {
+               // not supported by SQLite
+       }
+       
        function begin() {
                return queries("BEGIN");
        }

diff --git a/adminer/procedure.inc.php b/adminer/procedure.inc.php
index c047bd6c916de1aedd83e2c87ad85968ae47bc19..d75c37d3bfb376c4ae10963fe1afb92361a2c554 100644 (file)
--- a/adminer/procedure.inc.php
+++ b/adminer/procedure.inc.php
@@ -1,6 +1,7 @@
 <?php
 $PROCEDURE = $_GET["procedure"];
 $routine = (isset($_GET["function"]) ? "FUNCTION" : "PROCEDURE");
+$routine_languages = routine_languages();
 
 $dropped = false;
 if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"] && !$_POST["down"]) {
@@ -14,7 +15,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
        }
        $dropped = drop_create(
                "DROP $routine " . idf_escape($PROCEDURE),
-               "CREATE $routine " . idf_escape($_POST["name"]) . " (" . implode(", ", $set) . ")" . (isset($_GET["function"]) ? " RETURNS" . process_type($_POST["returns"], "CHARACTER SET") : "") . (in_array($_POST["language"], routine_languages()) ? " LANGUAGE $_POST[language]" : "") . rtrim("\n$_POST[definition]", ";") . ";",
+               "CREATE $routine " . idf_escape($_POST["name"]) . " (" . implode(", ", $set) . ")" . (isset($_GET["function"]) ? " RETURNS" . process_type($_POST["returns"], "CHARACTER SET") : "") . (in_array($_POST["language"], $routine_languages) ? " LANGUAGE $_POST[language]" : "") . rtrim("\n$_POST[definition]", ";") . ";",
                substr(ME, 0, -1),
                lang('Routine has been dropped.'),
                lang('Routine has been altered.'),
@@ -40,7 +41,7 @@ if ($_POST) {
 
 <form action="" method="post" id="form">
 <p><?php echo lang('Name'); ?>: <input name="name" value="<?php echo h($row["name"]); ?>" maxlength="64">
-<?php echo lang('Language'); ?>: <?php echo html_select("language", routine_languages(), $row["language"]); ?>
+<?php echo ($routine_languages ? lang('Language') . ": " . html_select("language", $routine_languages, $row["language"]) : ""); ?>
 <table cellspacing="0" class="nowrap">
 <?php
 edit_fields($row["fields"], $collations, $routine);