From d481a5716929ad874bf5b299e27bab7ba3f7a3f1 Mon Sep 17 00:00:00 2001
From: jakubvrana
Date: Mon, 15 Jun 2009 08:18:19 +0000
Subject: [PATCH] Join SQL forms
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@688 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
adminer/sql.inc.php | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php
index eb1f61b6..f350c240 100644
--- a/adminer/sql.inc.php
+++ b/adminer/sql.inc.php
@@ -2,7 +2,7 @@
page_header(lang('SQL command'), $error);
if (!$error && $_POST) {
- if (is_string($query = (isset($_POST["query"]) ? $_POST["query"] : get_file("sql_file")))) {
+ if (is_string($query = (isset($_POST["file"]) ? get_file("sql_file") : $_POST["query"]))) {
@set_time_limit(0);
$query = str_replace("\r", "", $query);
$delimiter = ";";
@@ -62,24 +62,22 @@ if (!$error && $_POST) {
}
?>
-
" . lang('File uploads are disabled.') . "
\n";
} else { ?>
-