From 8598a9757a3f535bcaa925c7fdce2e2e56f607dc Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Fri, 8 May 2009 05:57:01 +0000
Subject: [PATCH] Prepare for version 2

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@604 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 editing.inc.php   | 2 +-
 functions.inc.php | 8 --------
 mysql.inc.php     | 8 ++++++++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/editing.inc.php b/editing.inc.php
index e246faa6..cf8d2316 100644
--- a/editing.inc.php
+++ b/editing.inc.php
@@ -91,7 +91,7 @@ function edit_type($key, $field, $collations) {
 	?>
 <td><select name="<?php echo $key; ?>[type]" onchange="type_change(this);"><?php echo optionlist(array_keys($types), $field["type"]); ?></select></td>
 <td><input name="<?php echo $key; ?>[length]" value="<?php echo htmlspecialchars($field["length"]); ?>" size="3" /></td>
-<td><select name="<?php echo $key; ?>[collation]"<?php echo (preg_match('~char|text|enum|set~', $field["type"]) ? "" : " class='hidden'"); ?>><option value="">(<?php echo lang('collation'); ?>)</option><?php echo optionlist($collations, $field["collation"]); ?></select> <select name="<?php echo $key; ?>[unsigned]"<?php echo (!$field["type"] || preg_match('~int|float|double|decimal~', $field["type"]) ? "" : " class='hidden'"); ?>><?php echo optionlist($unsigned, $field["unsigned"]); ?></select></td>
+<td><?php echo "<select name=\"$key" . '[collation]"' . (preg_match('~char|text|enum|set~', $field["type"]) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')</option>' . optionlist($collations, $field["collation"]) . '</select>' . ($unsigned ? " <select name=\"$key" . '[unsigned]"' . (!$field["type"] || preg_match('~int|float|double|decimal~', $field["type"]) ? "" : " class='hidden'") . '>' . optionlist($unsigned, $field["unsigned"]) . '</select>' : ''); ?></td>
 <?php
 }
 
diff --git a/functions.inc.php b/functions.inc.php
index 19ab251d..456f76d4 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -41,14 +41,6 @@ function get_vals($query) {
 	return $return;
 }
 
-function table_status($table) {
-	global $dbh;
-	$result = $dbh->query("SHOW TABLE STATUS LIKE '" . $dbh->escape_string(addcslashes($table, "%_")) . "'");
-	$return = $result->fetch_assoc();
-	$result->free();
-	return $return;
-}
-
 function unique_idf($row, $indexes) {
 	foreach ($indexes as $index) {
 		if ($index["type"] == "PRIMARY" || $index["type"] == "UNIQUE") {
diff --git a/mysql.inc.php b/mysql.inc.php
index b8bee319..4a22c154 100644
--- a/mysql.inc.php
+++ b/mysql.inc.php
@@ -284,6 +284,14 @@ function get_databases() {
 	return $return;
 }
 
+function table_status($table) {
+	global $dbh;
+	$result = $dbh->query("SHOW TABLE STATUS LIKE '" . $dbh->escape_string(addcslashes($table, "%_")) . "'");
+	$return = $result->fetch_assoc();
+	$result->free();
+	return $return;
+}
+
 function fields($table) {
 	global $dbh;
 	$return = array();