diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index a5ff0219..6ef46f4a 100644
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -233,7 +233,7 @@ if (support("partitioning")) {
echo '
';
echo '';
echo ($key == count($row["partition_names"]) - 1 ? script("qsl('input').oninput = partitionNameChange;") : '');
- echo ' | ';
+ echo ' | ';
}
echo "\n\n";
}
diff --git a/adminer/drivers/sqlite.inc.php b/adminer/drivers/sqlite.inc.php
index 7826a52a..0deb5107 100644
--- a/adminer/drivers/sqlite.inc.php
+++ b/adminer/drivers/sqlite.inc.php
@@ -385,7 +385,7 @@ if (isset($_GET["sqlite"])) {
function drop_databases($databases) {
global $connection;
- $connection->__construct(":memory:"); // to unlock file, doesn't work in PDO on Windows
+ $connection->connect(":memory:"); // to unlock file, doesn't work in PDO on Windows
foreach ($databases as $db) {
if (!@unlink($db)) {
$connection->error = lang('File exists.');
@@ -400,7 +400,7 @@ if (isset($_GET["sqlite"])) {
if (!check_sqlite_name($name)) {
return false;
}
- $connection->__construct(":memory:");
+ $connection->connect(":memory:");
$connection->error = lang('File exists.');
return @rename(DB, $name);
}
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index e91d8b22..2db9148a 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -385,7 +385,7 @@ class Adminer {
$i = 0;
$select[""] = array();
foreach ($select as $key => $val) {
- $val = $_GET["columns"][$key];
+ $val = idx($_GET["columns"], $key, array());
$column = select_input(
" name='columns[$i][col]'",
$columns,
@@ -879,7 +879,7 @@ class Adminer {
$values = array();
foreach ($row as $val) {
$field = $result->fetch_field();
- if ($fields[$field->name]['generated']) {
+ if (idx($fields[$field->name], 'generated')) {
$generated[$field->name] = true;
continue;
}
diff --git a/adminer/indexes.inc.php b/adminer/indexes.inc.php
index 07242037..acdb5ad9 100644
--- a/adminer/indexes.inc.php
+++ b/adminer/indexes.inc.php
@@ -139,7 +139,7 @@ foreach ($row["indexes"] as $index) {
"partial(" . ($i == count($index["columns"]) ? "indexesAddColumn" : "indexesChangeColumn") . ", '" . js_escape(JUSH == "sql" ? "" : $_GET["indexes"] . "_") . "')"
);
echo "";
- echo ($lengths ? "" : "");
+ echo ($lengths ? "" : "");
echo (support("descidx") ? checkbox("indexes[$j][descs][$i]", 1, idx($index["descs"], $key), lang('descending')) : "");
echo " ";
$i++;
diff --git a/tests/sqlite.html b/tests/sqlite.html
index e2f1e39c..02777e56 100644
--- a/tests/sqlite.html
+++ b/tests/sqlite.html
@@ -145,7 +145,7 @@
Schema |
-open | /adminer/sqlite.php?sqlite=&username=ODBC&db=adminer_test&schema= | |
+open | /adminer/sqlite.php?sqlite=&username=ODBC&db=adminer_test.sqlite&schema= | |
verifyTextPresent | Permanent link | |
|