nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not attempt to read upload dir when not configured.

Browse Source
This commit is contained in:
Michal Čihař
2005-10-14 08:34:04 +00:00
parent 09badf9bd4
commit 4559cf5373
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-10-14 Michal Čihař <michal@cihar.com>
* libraries/sql_query_form.lib.php: Do not attempt to read upload dir when
not configured.
2005-10-13 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2005-10-13 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* lang/*: typo 'unser' -> 'user' * lang/*: typo 'unser' -> 'user'

6
libraries/sql_query_form.lib.php
View File

@@ -469,7 +469,11 @@ function PMA_sqlQueryFormUpload() {
$matcher = '@\.sql(\.(' . PMA_supportedDecompressions() . '))?$@'; // we allow only SQL here $matcher = '@\.sql(\.(' . PMA_supportedDecompressions() . '))?$@'; // we allow only SQL here
$files = PMA_getFileSelectOptions($GLOBALS['cfg']['UploadDir'], $matcher, (isset($timeout_passed) && $timeout_passed && isset($local_import_file)) ? $local_import_file : ''); if (!empty($GLOBALS['cfg']['UploadDir'])) {
$files = PMA_getFileSelectOptions($GLOBALS['cfg']['UploadDir'], $matcher, (isset($timeout_passed) && $timeout_passed && isset($local_import_file)) ? $local_import_file : '');
} else {
$files = '';
}
// start output // start output
echo '<fieldset id="">'; echo '<fieldset id="">';