bug #1759194 [import] open_basedir warning

This commit is contained in:
Marc Delisle
2007-11-18 14:18:00 +00:00
parent 4b7628f699
commit f207f7bb58
2 changed files with 4 additions and 1 deletions

View File

@@ -39,6 +39,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
keys and AUTO_INCREMENT
- [display] Division by zero when showing all records (page selector)
- bug #1828265 [privileges] No weird characters in generated password
- bug #1759194 [import] open_basedir warning
2.11.2.1 (2007-11-11)
- fixed possible SQL injection using database name

View File

@@ -22,7 +22,9 @@ function PMA_getDirContent($dir, $expression = '')
$dir .= '/';
}
while ($file = @readdir($handle)) {
if (is_file($dir . $file) && ($expression == '' || preg_match($expression, $file))) {
// for PHP < 5.2.4, is_file() gives a warning when using open_basedir
// and opening '..'
if ('..' != $file && is_file($dir . $file) && ($expression == '' || preg_match($expression, $file))) {
$result[] = $file;
}
}