diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-11-07 13:12:16 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-11-07 13:12:16 +0100 |
| commit | 371e54e0547829de06f5cf919a392e2407c54bc8 (patch) | |
| tree | 37e6d78aceaca0985a1b9fb86cd797121e245344 | |
| parent | 2e5217f773cc8e223af382b62246006f8caf1c5f (diff) | |
| parent | 5cdf27edefd5e045c7834badbaaadf71f77d1f85 (diff) | |
| download | forums-371e54e0547829de06f5cf919a392e2407c54bc8.tar forums-371e54e0547829de06f5cf919a392e2407c54bc8.tar.gz forums-371e54e0547829de06f5cf919a392e2407c54bc8.tar.bz2 forums-371e54e0547829de06f5cf919a392e2407c54bc8.tar.xz forums-371e54e0547829de06f5cf919a392e2407c54bc8.zip | |
Merge branch 'ticket/paul999/9696' into develop-olympus
* ticket/paul999/9696:
[ticket/9696] Surpress is_dir() notice when using SQLite with open_basedir.
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index e154aa44b0..561a9906c4 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1052,7 +1052,7 @@ function phpbb_own_realpath($path) // @todo If the file exists fine and open_basedir only has one path we should be able to prepend it // because we must be inside that basedir, the question is where... // @internal The slash in is_dir() gets around an open_basedir restriction - if (!@file_exists($resolved) || (!is_dir($resolved . '/') && !is_file($resolved))) + if (!@file_exists($resolved) || (!@is_dir($resolved . '/') && !is_file($resolved))) { return false; } |