diff --git a/adminer/edit.inc.php b/adminer/edit.inc.php
index a231e183..8b67ebc2 100644
--- a/adminer/edit.inc.php
+++ b/adminer/edit.inc.php
@@ -19,22 +19,26 @@ if ($_POST && !$error && !isset($_GET["select"])) {
}
}
}
- $set = array();
- foreach ($fields as $name => $field) {
- $val = process_input($field);
- if (!$update) {
- $set[idf_escape($name)] = ($val !== false ? $val : "''");
- } elseif ($val !== false) {
- $set[] = "\n" . idf_escape($name) . " = $val";
- }
- }
- if (!$set) {
- redirect($location);
- }
- if ($update) {
- query_redirect("UPDATE " . idf_escape($TABLE) . " SET" . implode(",", $set) . "\nWHERE $where\nLIMIT 1", $location, lang('Item has been updated.'));
+ if (isset($_POST["delete"])) {
+ query_redirect("DELETE FROM " . idf_escape($_GET["edit"]) . " WHERE $where LIMIT 1", $location, lang('Item has been deleted.'));
} else {
- query_redirect("INSERT INTO " . idf_escape($TABLE) . " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")", $location, lang('Item has been inserted.'));
+ $set = array();
+ foreach ($fields as $name => $field) {
+ $val = process_input($field);
+ if (!$update) {
+ $set[idf_escape($name)] = ($val !== false ? $val : "''");
+ } elseif ($val !== false) {
+ $set[] = "\n" . idf_escape($name) . " = $val";
+ }
+ }
+ if (!$set) {
+ redirect($location);
+ }
+ if ($update) {
+ query_redirect("UPDATE " . idf_escape($TABLE) . " SET" . implode(",", $set) . "\nWHERE $where\nLIMIT 1", $location, lang('Item has been updated.'));
+ } else {
+ query_redirect("INSERT INTO " . idf_escape($TABLE) . " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")", $location, lang('Item has been inserted.'));
+ }
}
}
@@ -103,5 +107,8 @@ if ($fields) {
echo "\n";
}
}
+if ($update) {
+ echo "\n";
+}
?>
diff --git a/adminer/lang/cs.inc.php b/adminer/lang/cs.inc.php
index 491b84f9..3bfebe43 100644
--- a/adminer/lang/cs.inc.php
+++ b/adminer/lang/cs.inc.php
@@ -37,6 +37,7 @@ $translations = array(
'No tables.' => 'Žádné tabulky.',
'select' => 'vypsat',
'Create new table' => 'Vytvořit novou tabulku',
+ 'Item has been deleted.' => 'Položka byla smazána.',
'Item has been updated.' => 'Položka byla aktualizována.',
'Item has been inserted.' => 'Položka byla vložena.',
'Edit' => 'Upravit',
diff --git a/adminer/lang/de.inc.php b/adminer/lang/de.inc.php
index 05f2a358..6a761af1 100644
--- a/adminer/lang/de.inc.php
+++ b/adminer/lang/de.inc.php
@@ -37,6 +37,7 @@ $translations = array(
'No tables.' => 'Keine Tabellen.',
'select' => 'zeigen',
'Create new table' => 'Neue Tabelle',
+ 'Item has been deleted.' => 'Datensatz gelöscht.',
'Item has been updated.' => 'Datensatz geändert.',
'Item has been inserted.' => 'Datensatz hinzugefügt.',
'Edit' => 'Ändern',
diff --git a/adminer/lang/es.inc.php b/adminer/lang/es.inc.php
index d3dadc61..ffd271bf 100644
--- a/adminer/lang/es.inc.php
+++ b/adminer/lang/es.inc.php
@@ -37,6 +37,7 @@ $translations = array(
'No tables.' => 'No existen tablas.',
'select' => 'registros',
'Create new table' => 'Nueva tabla',
+ 'Item has been deleted.' => 'Registro eliminado.',
'Item has been updated.' => 'Registro modificado.',
'Item has been inserted.' => 'Registro insertado.',
'Edit' => 'Modificar',
diff --git a/adminer/lang/et.inc.php b/adminer/lang/et.inc.php
index 0120a52a..326f325d 100644
--- a/adminer/lang/et.inc.php
+++ b/adminer/lang/et.inc.php
@@ -37,6 +37,7 @@ $translations = array(
'No tables.' => 'Tabeleid ei leitud.',
'select' => 'kuva',
'Create new table' => 'Loo uus tabel',
+ 'Item has been deleted.' => 'Kustutamine õnnestus.',
'Item has been updated.' => 'Uuendamine õnnestus.',
'Item has been inserted.' => 'Lisamine õnnestus.',
'Edit' => 'Muuda',
diff --git a/adminer/lang/fr.inc.php b/adminer/lang/fr.inc.php
index f2f43f84..8b743bc4 100644
--- a/adminer/lang/fr.inc.php
+++ b/adminer/lang/fr.inc.php
@@ -37,6 +37,7 @@ $translations = array(
'No tables.' => 'Aucunes tables.',
'select' => 'select',
'Create new table' => 'Créer une table',
+ 'Item has been deleted.' => 'Élément supprimé.',
'Item has been updated.' => 'Élément modifié.',
'Item has been inserted.' => 'Élément inseré.',
'Edit' => 'Modifier',
diff --git a/adminer/lang/it.inc.php b/adminer/lang/it.inc.php
index c5608745..78dcca34 100644
--- a/adminer/lang/it.inc.php
+++ b/adminer/lang/it.inc.php
@@ -37,6 +37,7 @@ $translations = array(
'No tables.' => 'No tabelle.',
'select' => 'seleziona',
'Create new table' => 'Crea nuova tabella',
+ 'Item has been deleted.' => 'Elemento eliminato.',
'Item has been updated.' => 'Elemento aggiornato.',
'Item has been inserted.' => 'Elemento inserito.',
'Edit' => 'Modifica',
diff --git a/adminer/lang/nl.inc.php b/adminer/lang/nl.inc.php
index 75448894..d688ea6a 100644
--- a/adminer/lang/nl.inc.php
+++ b/adminer/lang/nl.inc.php
@@ -37,6 +37,7 @@ $translations = array(
'No tables.' => 'Geen tabellen.',
'select' => 'kies',
'Create new table' => 'Nieuwe tabel',
+ 'Item has been deleted.' => 'Item verwijderd.',
'Item has been updated.' => 'Item aangepast.',
'Item has been inserted.' => 'Item toegevoegd.',
'Edit' => 'Bewerk',
diff --git a/adminer/lang/ru.inc.php b/adminer/lang/ru.inc.php
index 36b3f2da..c27a2bf3 100644
--- a/adminer/lang/ru.inc.php
+++ b/adminer/lang/ru.inc.php
@@ -37,6 +37,7 @@ $translations = array(
'No tables.' => 'В базе данных нет таблиц.',
'select' => 'выбрать',
'Create new table' => 'Создать новую таблицу',
+ 'Item has been deleted.' => 'Запись удалена.',
'Item has been updated.' => 'Запись обновлена.',
'Item has been inserted.' => 'Запись вставлена.',
'Edit' => 'Редактировать',
diff --git a/adminer/lang/sk.inc.php b/adminer/lang/sk.inc.php
index 2700f4b2..7b468b01 100644
--- a/adminer/lang/sk.inc.php
+++ b/adminer/lang/sk.inc.php
@@ -37,6 +37,7 @@ $translations = array(
'No tables.' => 'Žiadne tabuľky.',
'select' => 'vypísať',
'Create new table' => 'Vytvoriť novú tabuľku',
+ 'Item has been deleted.' => 'Položka bola vymazaná.',
'Item has been updated.' => 'Položka bola aktualizovaná.',
'Item has been inserted.' => 'Položka bola vložená.',
'Edit' => 'Upraviť',
diff --git a/adminer/lang/zh.inc.php b/adminer/lang/zh.inc.php
index 0a46e095..4582befc 100644
--- a/adminer/lang/zh.inc.php
+++ b/adminer/lang/zh.inc.php
@@ -37,6 +37,7 @@ $translations = array(
'No tables.' => '没有表。',
'select' => '选择',
'Create new table' => '创建新表',
+ 'Item has been deleted.' => '已删除项目。',
'Item has been updated.' => '已更新项目。',
'Item has been inserted.' => '已插入项目。',
'Edit' => '编辑',
diff --git a/changes.txt b/changes.txt
index 1a6af193..503d14b2 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,6 @@
+Adminer 2.2.2-dev:
+Add Delete button to Edit page (regression from 2.0.0)
+
Adminer 2.2.1 (released 2009-11-26):
Highlight current links
Improve concurrency