diff options
| author | fisharebest <fisharebest@gmail.com> | 2010-04-24 14:13:46 +0000 |
|---|---|---|
| committer | fisharebest <fisharebest@gmail.com> | 2010-04-24 14:13:46 +0000 |
| commit | ff22c7e21ecfdc2eb3e2c623babff19005f8634b (patch) | |
| tree | a277ec48dfa243cd9ad4d67e2f688f75b584d8f2 | |
| parent | f96ddc44e9b24ec59a0189d0f43aa72610b63ff7 (diff) | |
| download | webtrees-ff22c7e21ecfdc2eb3e2c623babff19005f8634b.tar.gz webtrees-ff22c7e21ecfdc2eb3e2c623babff19005f8634b.tar.bz2 webtrees-ff22c7e21ecfdc2eb3e2c623babff19005f8634b.zip | |
Fix: don't scan directories when looking for gedcoms in the data/ directory
| -rw-r--r-- | editgedcoms.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editgedcoms.php b/editgedcoms.php index 928e53b1cf..4d5e6571a2 100644 --- a/editgedcoms.php +++ b/editgedcoms.php @@ -156,7 +156,7 @@ case 'importform': $d=opendir($INDEX_DIRECTORY); $files=array(); while (($f=readdir($d))!==false) { - if (is_file($INDEX_DIRECTORY.$f) && is_readable($INDEX_DIRECTORY.$f)) { + if (!is_dir($INDEX_DIRECTORY.$f) && is_readable($INDEX_DIRECTORY.$f)) { $fp=fopen($INDEX_DIRECTORY.$f, 'rb'); $header=fread($fp, 64); fclose($fp); @@ -271,7 +271,7 @@ if (WT_USER_IS_ADMIN) { $d=opendir($INDEX_DIRECTORY); $files=false; while (($f=readdir($d))!==false) { - if (!in_array($f, $all_gedcoms) && is_readable($INDEX_DIRECTORY.$f)) { + if (!in_array($f, $all_gedcoms) && !is_dir($INDEX_DIRECTORY.$f) && is_readable($INDEX_DIRECTORY.$f)) { $fp=fopen($INDEX_DIRECTORY.$f, 'rb'); $header=fread($fp, 64); fclose($fp); |