From 150841e5d7d79673ec4aff5b631e0e3a4e71662f Mon Sep 17 00:00:00 2001 From: ilessiivi Date: Fri, 21 Sep 2018 19:03:38 +0300 Subject: [PATCH] Hide import from server if no path --- adminer/sql.inc.php | 11 +++++++---- changes.txt | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/adminer/sql.inc.php b/adminer/sql.inc.php index c1549a3f..1119fbea 100644 --- a/adminer/sql.inc.php +++ b/adminer/sql.inc.php @@ -231,10 +231,13 @@ if (!isset($_GET["import"])) { : lang('File uploads are disabled.') ); echo "\n"; - echo "
" . lang('From server') . "
"; - echo lang('Webserver file %s', "" . h($adminer->importServerPath()) . "$gz"); - echo ' '; - echo "
\n"; + $importServerPath = $adminer->importServerPath(); + if ($importServerPath) { + echo "
" . lang('From server') . "
"; + echo lang('Webserver file %s', "" . h($importServerPath) . "$gz"); + echo ' '; + echo "
\n"; + } echo "

"; } diff --git a/changes.txt b/changes.txt index 859063bb..b1d6b71e 100644 --- a/changes.txt +++ b/changes.txt @@ -1,6 +1,7 @@ Adminer 4.7.0-dev: Simplify storing executed SQL queries to bookmarks Warn when using password with leading or trailing spaces +Hide import from server if no path Fix inline editing of empty cells (regression from 4.6.3) Allow adding more than two indexes and forign key columns at a time (regression from 4.4.0) Fix function change with set data type